From de4fde9095c5380e8cef0a188d244a10f9184d6d Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 7 Sep 2016 22:23:38 +0000
Subject: * lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0.beta2   Fixed ri parse
 defect with left-hand matched classes.  
 https://github.com/rdoc/rdoc/pull/420

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/ri/driver.rb | 3 +--
 lib/rdoc/ri/paths.rb  | 3 ---
 lib/rdoc/ri/task.rb   | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'lib/rdoc/ri')

diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb
index 3bd0e50d84..7942406ceb 100644
--- a/lib/rdoc/ri/driver.rb
+++ b/lib/rdoc/ri/driver.rb
@@ -908,7 +908,7 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
 
   def expand_class klass
     ary = classes.keys.grep(Regexp.new("\\A#{klass.gsub(/(?=::|\z)/, '[^:]*')}\\z"))
-    raise NotFoundError, klass if ary.length != 1
+    raise NotFoundError, klass if ary.length != 1 && ary.first != klass
     ary.first
   end
 
@@ -1480,4 +1480,3 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
   end
 
 end
-
diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
index 41529a3e0d..94db2216a2 100644
--- a/lib/rdoc/ri/paths.rb
+++ b/lib/rdoc/ri/paths.rb
@@ -82,8 +82,6 @@ module RDoc::RI::Paths
   # ri documentation.
 
   def self.gemdirs filter = :latest
-    require 'rubygems' unless defined?(Gem)
-
     ri_paths = {}
 
     all = Gem::Specification.map do |spec|
@@ -185,4 +183,3 @@ module RDoc::RI::Paths
   end
 
 end
-
diff --git a/lib/rdoc/ri/task.rb b/lib/rdoc/ri/task.rb
index d45f0c664c..cc0a85d4b7 100644
--- a/lib/rdoc/ri/task.rb
+++ b/lib/rdoc/ri/task.rb
@@ -1,5 +1,4 @@
 # frozen_string_literal: false
-require 'rubygems'
 begin
   gem 'rdoc'
 rescue Gem::LoadError
-- 
cgit v1.2.3