From f72d5effb79a9957a0abd62c4f743e67cbf8e5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 27 Mar 2025 15:34:14 +0100 Subject: [PATCH] [rubygems/rubygems] `SpecSet#add_extra_platforms!` doesn't need to return anything https://github.com/rubygems/rubygems/commit/9fd92ade54 --- lib/bundler/definition.rb | 2 +- lib/bundler/spec_set.rb | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 491d4f11cb..6f51168bcc 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -760,7 +760,7 @@ module Bundler end end - @platforms = result.add_extra_platforms!(platforms) if should_add_extra_platforms? + result.add_extra_platforms!(platforms) if should_add_extra_platforms? SpecSet.new(result.for(dependencies, @platforms | [Gem::Platform::RUBY])) end diff --git a/lib/bundler/spec_set.rb b/lib/bundler/spec_set.rb index 8d75c29420..1de31da4cf 100644 --- a/lib/bundler/spec_set.rb +++ b/lib/bundler/spec_set.rb @@ -48,7 +48,10 @@ module Bundler end def add_extra_platforms!(platforms) - return platforms.concat([Gem::Platform::RUBY]).uniq if @specs.empty? + if @specs.empty? + platforms.concat([Gem::Platform::RUBY]).uniq + return + end new_platforms = all_platforms.select do |platform| next if platforms.include?(platform) @@ -56,14 +59,12 @@ module Bundler complete_platform(platform) end - return platforms if new_platforms.empty? + return if new_platforms.empty? platforms.concat(new_platforms) less_specific_platform = new_platforms.find {|platform| platform != Gem::Platform::RUBY && Bundler.local_platform === platform && platform === Bundler.local_platform } platforms.delete(Bundler.local_platform) if less_specific_platform - - platforms end def validate_deps(s)