summaryrefslogtreecommitdiff
path: root/lib/rubygems/version.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-28 01:16:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-28 01:16:43 +0000
commitb6139464f544ec511f741f5bbae2fb13adc51c21 (patch)
tree00e91ff57caed712ae08e8b657e8e0a52a030d7c /lib/rubygems/version.rb
parent69934aeb8d7948c4ca590b7092504c41d8bce6ac (diff)
rubygems 2.6.7
* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems to 2.6.7, not the master, with r56225. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/version.rb')
-rw-r--r--lib/rubygems/version.rb18
1 files changed, 2 insertions, 16 deletions
diff --git a/lib/rubygems/version.rb b/lib/rubygems/version.rb
index 6eeaafdcc5..2f6cfae6ed 100644
--- a/lib/rubygems/version.rb
+++ b/lib/rubygems/version.rb
@@ -237,7 +237,7 @@ class Gem::Version
end
def hash # :nodoc:
- canonical_segments.hash
+ @version.hash
end
def init_with coder # :nodoc:
@@ -331,7 +331,7 @@ class Gem::Version
def <=> other
return unless Gem::Version === other
- return 0 if @version == other._version || canonical_segments == other.canonical_segments
+ return 0 if @version == other._version
lhsegments = _segments
rhsegments = other._segments
@@ -356,13 +356,6 @@ class Gem::Version
return 0
end
- def canonical_segments
- @canonical_segments ||=
- _split_segments.map! do |segments|
- segments.reverse_each.drop_while {|s| s == 0 }.reverse
- end.reduce(&:concat)
- end
-
protected
def _version
@@ -378,11 +371,4 @@ class Gem::Version
/^\d+$/ =~ s ? s.to_i : s
end.freeze
end
-
- def _split_segments
- string_start = _segments.index {|s| s.is_a?(String) }
- string_segments = segments
- numeric_segments = string_segments.slice!(0, string_start || string_segments.size)
- return numeric_segments, string_segments
- end
end