1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rubygems/rubygems] Remove no longer necessary code

Browse Source 
https://github.com/rubygems/rubygems/commit/9ea1539b08
This commit is contained in:
David Rodríguez 2024-11-14 22:03:46 +01:00 committed by Hiroshi SHIBATA
parent 10de74b75b
commit 2b91a56d40
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/bundler/resolver.rb
View File

@ -80,8 +80,7 @@ module Bundler
def solve_versions(root:, logger:) def solve_versions(root:, logger:)
solver = PubGrub::VersionSolver.new(source: self, root: root, logger: logger) solver = PubGrub::VersionSolver.new(source: self, root: root, logger: logger)
result = solver.solve result = solver.solve
resolved_specs = result.flat_map {|package, version| version.to_specs(package, @most_specific_locked_platform) } result.flat_map {|package, version| version.to_specs(package, @most_specific_locked_platform) }
resolved_specs |= @base.specs_compatible_with(SpecSet.new(resolved_specs))
rescue PubGrub::SolveFailure => e rescue PubGrub::SolveFailure => e
incompatibility = e.incompatibility incompatibility = e.incompatibility

4
lib/bundler/resolver/base.rb
View File

@ -30,10 +30,6 @@ module Bundler
end end
end end
def specs_compatible_with(result)
@base.specs_compatible_with(result)
end
def [](name) def [](name)
@base[name] @base[name]
end end

6
lib/bundler/spec_set.rb
View File

@ -163,12 +163,6 @@ module Bundler
@specs.detect {|spec| spec.name == name && spec.match_platform(platform) } @specs.detect {|spec| spec.name == name && spec.match_platform(platform) }
end end
def specs_compatible_with(other)
select do |spec|
other.valid?(spec)
end
end
def delete_by_name(name) def delete_by_name(name)
@specs.reject! {|spec| spec.name == name } @specs.reject! {|spec| spec.name == name }