diff options
| author | Andre Arko <andre@arko.net> | 2014-10-20 19:57:12 -0700 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2014-10-20 19:59:28 -0700 |
| commit | cfab0dbf50a562f55574ecc156610f27522548c3 (patch) | |
| tree | e012dc3b3bd561fd6dde4851689295fc85afc0ad | |
| parent | ed8ad7dac4f89d283c1e7a4c0662cd88ce75e613 (diff) | |
| download | bundler-cfab0dbf50a562f55574ecc156610f27522548c3.tar.gz | |
Revert "Performance: lazily memoize expensive `prerelease?` values during resolve"
Too soon! This is part of changes in the master branch for 1.8.
This reverts commit ed8ad7dac4f89d283c1e7a4c0662cd88ce75e613.
| -rw-r--r-- | lib/bundler/resolver.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 218a69969d..7c4a10482e 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -140,7 +140,6 @@ module Bundler @index = index @deps_for = {} @missing_gems = Hash.new(0) - @prereleases_cache = Hash.new { |h,k| h[k] = k.prerelease? } @source_requirements = source_requirements @iteration_counter = 0 @started_at = Time.now @@ -265,7 +264,7 @@ module Bundler reqs = reqs.sort_by do |a| [ activated[a.name] ? 0 : 1, - @prereleases_cache[a.requirement] ? 0 : 1, + a.requirement.prerelease? ? 0 : 1, @errors[a.name] ? 0 : 1, activated[a.name] ? 0 : @gems_size[a] ] end |