ruby-changes:74075
From: David <ko1@a...>
Date: Tue, 18 Oct 2022 16:33:36 +0900 (JST)
Subject: [ruby-changes:74075] 8c4bd1e58d (master): [rubygems/rubygems] Remove another `expand_dependencies` instance
https://git.ruby-lang.org/ruby.git/commit/?id=8c4bd1e58d From 8c4bd1e58d426ff014a3958ac197d40b4e367f00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Wed, 6 Jul 2022 22:21:32 +0200 Subject: [rubygems/rubygems] Remove another `expand_dependencies` instance https://github.com/rubygems/rubygems/commit/33769ddb07 --- lib/bundler/definition.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index a289babcb3..6537ba1de8 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -224,7 +224,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L224 def current_dependencies dependencies.select do |d| - d.should_include? && !d.gem_platforms(@platforms).empty? + d.should_include? && !d.gem_platforms([generic_local_platform]).empty? end end @@ -248,10 +248,9 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L248 def dependencies_for(groups) groups.map!(&:to_sym) - deps = current_dependencies.reject do |d| + current_dependencies.reject do |d| (d.groups & groups).empty? end - expand_dependencies(deps) end # Resolve all the dependencies specified in Gemfile. It ensures that -- cgit v1.2.3 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/