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

ruby-changes:74093

From: David <ko1@a...>
Date: Tue, 18 Oct 2022 16:33:48 +0900 (JST)
Subject: [ruby-changes:74093] cef7f6b224 (master): [rubygems/rubygems] Remove now unnecessary parameter to `expand_dependencies`

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

From cef7f6b2241565f51bb724c19b89b8320825b98a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...>
Date: Wed, 6 Jul 2022 22:29:13 +0200
Subject: [rubygems/rubygems] Remove now unnecessary parameter to
 `expand_dependencies`

We just call it once for resolution, so we can simplify things.

https://github.com/rubygems/rubygems/commit/99c144fbe3
---
 lib/bundler/definition.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 6537ba1de8..1cf0bbbdb4 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -479,7 +479,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L479
     end
 
     def expanded_dependencies
-      @expanded_dependencies ||= expand_dependencies(dependencies + metadata_dependencies, true)
+      @expanded_dependencies ||= expand_dependencies(dependencies + metadata_dependencies)
     end
 
     def filter_specs(specs, deps)
@@ -791,11 +791,10 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L791
       ]
     end
 
-    def expand_dependencies(dependencies, remote = false)
+    def expand_dependencies(dependencies)
       deps = []
       dependencies.each do |dep|
-        next unless remote || dep.current_platform?
-        target_platforms = dep.gem_platforms(remote ? @platforms : [generic_local_platform])
+        target_platforms = dep.gem_platforms(@platforms)
         deps += expand_dependency_with_platforms(dep, target_platforms)
       end
       deps
-- 
cgit v1.2.3


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

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