From dd1bfbc0613c1131b1c31f02e336f88255eb3cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Mon, 15 Jun 2020 12:26:52 +0200 Subject: 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. --- lib/rubygems/rdoc.rb | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'lib') 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 @@ -1,18 +1,6 @@ # frozen_string_literal: true 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 -- cgit v1.2.3