diff options
Diffstat (limited to 'lib/rubygems/resolver/conflict.rb')
| -rw-r--r-- | lib/rubygems/resolver/conflict.rb | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/lib/rubygems/resolver/conflict.rb b/lib/rubygems/resolver/conflict.rb index aba6d73ea7..367a36b43d 100644 --- a/lib/rubygems/resolver/conflict.rb +++ b/lib/rubygems/resolver/conflict.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + ## # Used internally to indicate that a dependency conflicted # with a spec that would be activated. @@ -54,7 +55,7 @@ class Gem::Resolver::Conflict activated = @activated.spec.full_name dependency = @failed_dep.dependency requirement = dependency.requirement - alternates = dependency.matching_specs.map {|spec| spec.full_name } + alternates = dependency.matching_specs.map(&:full_name) unless alternates.empty? matching = <<-MATCHING.chomp @@ -63,10 +64,7 @@ class Gem::Resolver::Conflict %s MATCHING - matching = matching % [ - dependency, - alternates.join(", "), - ] + matching = format(matching, dependency, alternates.join(", ")) end explanation = <<-EXPLANATION @@ -81,12 +79,7 @@ class Gem::Resolver::Conflict %s EXPLANATION - explanation % [ - activated, requirement, - request_path(@activated).reverse.join(", depends on\n "), - request_path(@failed_dep).reverse.join(", depends on\n "), - matching - ] + format(explanation, activated, requirement, request_path(@activated).reverse.join(", depends on\n "), request_path(@failed_dep).reverse.join(", depends on\n "), matching) end ## @@ -131,7 +124,7 @@ class Gem::Resolver::Conflict current = current.parent when Gem::Resolver::DependencyRequest then - path << "#{current.dependency}" + path << current.dependency.to_s current = current.requester else |