[前][次][番号順一覧][スレッド一覧]

ruby-changes:61754

From: David <ko1@a...>
Date: Wed, 17 Jun 2020 21:17:32 +0900 (JST)
Subject: [ruby-changes:61754] dd1bfbc061 (master): Remove unneeded code

https://git.ruby-lang.org/ruby.git/commit/?id=dd1bfbc061

From dd1bfbc0613c1131b1c31f02e336f88255eb3cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...>
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.

diff --git a/lib/rubygems/rdoc.rb b/lib/rubygems/rdoc.rb
index 4e16fbb..c40bb7d 100644
--- a/lib/rubygems/rdoc.rb
+++ b/lib/rubygems/rdoc.rb
@@ -2,18 +2,6 @@ https://github.com/ruby/ruby/blob/trunk/lib/rubygems/rdoc.rb#L2
 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
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]