diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-30 13:01:35 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-30 13:01:35 +0000 |
| commit | 8da8d4b043c37b53a69803c71ff36b478d4776d0 (patch) | |
| tree | 7c8cec15645e74f19c88e4eb5b210b96174c7d03 /lib/rubygems/resolver.rb | |
| parent | c5cb386eba6d9a2d9a8e6ffa8c30137d0c4660c1 (diff) | |
| download | ruby-8da8d4b043c37b53a69803c71ff36b478d4776d0.tar.gz | |
Merge RubyGems 3.0.0.beta1.
* It drop to support < Ruby 2.2
* Cleanup deprecated methods and classes.
* Mark obsoleted methods to deprecate.
* and other enhancements.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/resolver.rb')
| -rw-r--r-- | lib/rubygems/resolver.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb index 13ee035e4c..866998dc59 100644 --- a/lib/rubygems/resolver.rb +++ b/lib/rubygems/resolver.rb @@ -171,7 +171,7 @@ class Gem::Resolver include Molinillo::UI def output - @output ||= debug? ? $stdout : File.open(Gem::Util::NULL_DEVICE, 'w') + @output ||= debug? ? $stdout : File.open(IO::NULL, 'w') end def debug? @@ -314,11 +314,6 @@ class Gem::Resolver end -## -# TODO remove in RubyGems 3 - -Gem::DependencyResolver = Gem::Resolver # :nodoc: - require 'rubygems/resolver/activation_request' require 'rubygems/resolver/conflict' require 'rubygems/resolver/dependency_request' |