[前][次][番号順一覧][スレッド一覧]

ruby-changes:73533

From: David <ko1@a...>
Date: Mon, 12 Sep 2022 22:13:50 +0900 (JST)
Subject: [ruby-changes:73533] 75d90cc8e5 (master): [rubygems/rubygems] Use a single hash to keep track of prereleases

https://git.ruby-lang.org/ruby.git/commit/?id=75d90cc8e5

From 75d90cc8e55ec662782526094b31ada1853a161b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...>
Date: Wed, 24 Aug 2022 10:57:35 +0200
Subject: [rubygems/rubygems] Use a single hash to keep track of prereleases

https://github.com/rubygems/rubygems/commit/9d7bd177b0
---
 lib/bundler/resolver.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index f70e1a3395..161a3c0518 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -42,8 +42,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/resolver.rb#L42
         remove_from_candidates(spec)
       end
 
-      @gem_version_promoter.prerelease_specified = @prerelease_specified = {}
-      requirements.each {|dep| @prerelease_specified[dep.name] ||= dep.prerelease? }
+      requirements.each {|dep| prerelease_specified[dep.name] ||= dep.prerelease? }
 
       verify_gemfile_dependencies_are_found!(requirements)
       result = @resolver.resolve(requirements).
@@ -214,6 +213,10 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/resolver.rb#L213
       @base.base_requirements
     end
 
+    def prerelease_specified
+      @gem_version_promoter.prerelease_specified
+    end
+
     def remove_from_candidates(spec)
       @base.delete(spec)
 
@@ -248,7 +251,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/resolver.rb#L251
           all - 1_000_000
         else
           search = search_for(dependency)
-          search = @prerelease_specified[dependency.name] ? search.count : search.count {|s| !s.version.prerelease? }
+          search = prerelease_specified[dependency.name] ? search.count : search.count {|s| !s.version.prerelease? }
           search - all
         end
       end
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]