From cfab0dbf50a562f55574ecc156610f27522548c3 Mon Sep 17 00:00:00 2001 From: Andre Arko Date: Mon, 20 Oct 2014 19:57:12 -0700 Subject: 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. --- lib/bundler/resolver.rb | 3 +-- 1 file changed, 1 insertion(+), 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 -- cgit v1.2.1