aboutsummaryrefslogtreecommitdiffstats
path: root/lib/rdoc/ri
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rdoc/ri')
-rw-r--r--lib/rdoc/ri/driver.rb3
-rw-r--r--lib/rdoc/ri/paths.rb3
-rw-r--r--lib/rdoc/ri/task.rb1
3 files changed, 1 insertions, 6 deletions
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