diff options
Diffstat (limited to 'lib/rdoc')
-rw-r--r-- | lib/rdoc/rubygems_hook.rb | 8 | ||||
-rw-r--r-- | lib/rdoc/test_case.rb | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/lib/rdoc/rubygems_hook.rb b/lib/rdoc/rubygems_hook.rb index 5711aa1abf..c4eaddbd97 100644 --- a/lib/rdoc/rubygems_hook.rb +++ b/lib/rdoc/rubygems_hook.rb @@ -3,11 +3,6 @@ require 'rubygems/user_interaction' require 'fileutils' require 'rdoc' -begin - require 'json' -rescue LoadError -end - ## # Gem::RDoc provides methods to generate RDoc and ri data for installed gems # upon gem installation. @@ -205,7 +200,7 @@ class RDoc::RubygemsHook @generate_ri and (@force or not File.exist? @ri_dir) document 'darkfish', options, @rdoc_dir if - defined?(JSON) and @generate_rdoc and (@force or not File.exist? @rdoc_dir) + @generate_rdoc and (@force or not File.exist? @rdoc_dir) end ## @@ -255,3 +250,4 @@ class RDoc::RubygemsHook end end + diff --git a/lib/rdoc/test_case.rb b/lib/rdoc/test_case.rb index 3b2c181201..4989516b7a 100644 --- a/lib/rdoc/test_case.rb +++ b/lib/rdoc/test_case.rb @@ -6,11 +6,6 @@ rescue NoMethodError, Gem::LoadError # for ruby tests end -begin - require 'json' -rescue LoadError -end - require 'minitest/autorun' require 'minitest/benchmark' if ENV['BENCHMARK'] @@ -219,3 +214,4 @@ $LOAD_PATH.each do |load_path| break if load_path[0] == ?/ load_path.replace File.expand_path load_path end if RUBY_VERSION < '1.9' + |