Skip to content

Commit

Permalink
[rubygems/rubygems] Remove no longer necessary code
Browse files Browse the repository at this point in the history
  • Loading branch information
deivid-rodriguez authored and hsbt committed Nov 26, 2024
1 parent 10de74b commit 2b91a56
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 12 deletions.
3 changes: 1 addition & 2 deletions lib/bundler/resolver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ def setup_solver
def solve_versions(root:, logger:)
solver = PubGrub::VersionSolver.new(source: self, root: root, logger: logger)
result = solver.solve
resolved_specs = result.flat_map {|package, version| version.to_specs(package, @most_specific_locked_platform) }
resolved_specs |= @base.specs_compatible_with(SpecSet.new(resolved_specs))
result.flat_map {|package, version| version.to_specs(package, @most_specific_locked_platform) }
rescue PubGrub::SolveFailure => e
incompatibility = e.incompatibility

Expand Down
4 changes: 0 additions & 4 deletions lib/bundler/resolver/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ def initialize(source_requirements, dependencies, base, platforms, options)
end
end

def specs_compatible_with(result)
@base.specs_compatible_with(result)
end

def [](name)
@base[name]
end
Expand Down
6 changes: 0 additions & 6 deletions lib/bundler/spec_set.rb
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,6 @@ def find_by_name_and_platform(name, platform)
@specs.detect {|spec| spec.name == name && spec.match_platform(platform) }
end

def specs_compatible_with(other)
select do |spec|
other.valid?(spec)
end
end

def delete_by_name(name)
@specs.reject! {|spec| spec.name == name }

Expand Down

0 comments on commit 2b91a56

Please sign in to comment.