diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2023-12-12 20:49:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-12 11:49:25 -0800 |
commit | 1572322e17caf2f0900f02099d21245b81554a28 (patch) | |
tree | d34f9b7e72d727ee1bf45d1b56e26db2b54637da /lib/bundler/rubygems_ext.rb | |
parent | 0366c424e59b65fed953aa2148eaf14cb90bb6d3 (diff) |
Sync with upstream rubygems (#9206)
Diffstat (limited to 'lib/bundler/rubygems_ext.rb')
-rw-r--r-- | lib/bundler/rubygems_ext.rb | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb index 876c03eb9f..428de48df9 100644 --- a/lib/bundler/rubygems_ext.rb +++ b/lib/bundler/rubygems_ext.rb @@ -179,37 +179,7 @@ module Gem end end - # comparison is done order independently since rubygems 3.2.0.rc.2 - unless Gem::Requirement.new("> 1", "< 2") == Gem::Requirement.new("< 2", "> 1") - class Requirement - module OrderIndependentComparison - def ==(other) - return unless Gem::Requirement === other - - if _requirements_sorted? && other._requirements_sorted? - super - else - _with_sorted_requirements == other._with_sorted_requirements - end - end - - protected - - def _requirements_sorted? - return @_requirements_sorted if defined?(@_requirements_sorted) - strings = as_list - @_requirements_sorted = strings == strings.sort - end - - def _with_sorted_requirements - @_with_sorted_requirements ||= _requirements_sorted? ? self : self.class.new(as_list.sort) - end - end - - prepend OrderIndependentComparison - end - end - + # Requirements using lambda operator differentiate trailing zeros since rubygems 3.2.6 if Gem::Requirement.new("~> 2.0").hash == Gem::Requirement.new("~> 2.0.0").hash class Requirement module CorrectHashForLambdaOperator |