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

[rubygems/rubygems] Remove conflict.rb code that was supposed to be removed in Rubygems 3

Browse Source 
https://github.com/rubygems/rubygems/commit/6d5f743a89
This commit is contained in:
bronzdoc 2019-06-22 16:58:55 -06:00 committed by Hiroshi SHIBATA
parent a7bce01175
commit 5eacb4c52e
No known key found for this signature in database
GPG Key ID: F9CF13417264FAC2
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/rubygems/resolver/conflict.rb
View File

@ -153,8 +153,3 @@ class Gem::Resolver::Conflict
end end
end end
##
# TODO: Remove in RubyGems 3
Gem::Resolver::DependencyConflict = Gem::Resolver::Conflict # :nodoc:

4
test/rubygems/test_gem_resolver_conflict.rb
View File

@ -3,10 +3,6 @@ require 'rubygems/test_case'
class TestGemResolverConflict < Gem::TestCase class TestGemResolverConflict < Gem::TestCase
def test_self_compatibility
assert_same Gem::Resolver::Conflict, Gem::Resolver::DependencyConflict
end
def test_explanation def test_explanation
root = root =
dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8' dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'