Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
base: 428e71619306
Choose a base ref
...
head repository: NixOS/nix
compare: 7c097275c486
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 29, 2020

  1. Set regex_constants::match_continuous for quicker search 

    match_continuous limits the search to the current start position,
instead of searching the entire file.

On libc++, this improves performance dramatically:

$ time /nix/store/70ai68dfm6xbzwn26j5n4li9di52ylia-nix-3.0pre20200728_c159f48/bin/nix print-dev-env >/dev/null
/nix/store/70ai68dfm6xbzwn26j5n4li9di52ylia-nix-3.0pre20200728_c159f48/bin/ni  2.39s user 0.19s system 64% cpu 4.032 total
$ time /nix/store/cwjfxxlp83zln4mfyy1d2dbsx7f6s962-nix-3.0pre20200728_dirty/bin/nix print-dev-env >/dev/null
/nix/store/cwjfxxlp83zln4mfyy1d2dbsx7f6s962-nix-3.0pre20200728_dirty/bin/nix   0.09s user 0.05s system 65% cpu 0.204 total

Fixes #3874
    @matthewbauer
    matthewbauer committed Jul 29, 2020
    Copy the full SHA
    fa8515d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3877 from matthewbauer/develop-continuous-regex 

    Set regex_constants::match_continuous for quicker search in nix develop
    @edolstra
    edolstra committed Jul 29, 2020
    Copy the full SHA
    7c09727 View commit details
    Browse the repository at this point in the history