diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2020-06-15 12:26:52 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-06-17 21:16:56 +0900 |
commit | dd1bfbc0613c1131b1c31f02e336f88255eb3cab (patch) | |
tree | 23b6fe7d497f40aeb7964018f1c08a93b844d47f /lib | |
parent | 7325bed2b45bc7678b95e1f79e151a7a779f7484 (diff) |
Remove unneeded code
This was added ~8 years to fix some json warning but I'm pretty sure
it's not needed anymore.
This has caused several issues in both ruby-core and rdoc test suite and
it doesn't make much sense to me these days so let's kill it.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3213
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rubygems/rdoc.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/rubygems/rdoc.rb b/lib/rubygems/rdoc.rb index 4e16fbb86f..c40bb7d9f1 100644 --- a/lib/rubygems/rdoc.rb +++ b/lib/rubygems/rdoc.rb @@ -2,18 +2,6 @@ require 'rubygems' begin - gem 'rdoc' -rescue Gem::LoadError - # swallow -else - # This will force any deps that 'rdoc' might have - # (such as json) that are ambiguous to be activated, which - # is important because we end up using Specification.reset - # and we don't want the warning it pops out. - Gem.finish_resolve -end - -begin require 'rdoc/rubygems_hook' module Gem RDoc = ::RDoc::RubygemsHook |