diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 08:36:37 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 08:36:37 +0000 |
| commit | 2e4f0af00f85ca228bcf5fa919882359411c652a (patch) | |
| tree | 6317ef3d0c352a8d7496139f34277e224fe3d4ac /lib/rdoc/rubygems_hook.rb | |
| parent | 7b14512bee222bdb6392e865b00ef4b4c42b9364 (diff) | |
| download | ruby-2e4f0af00f85ca228bcf5fa919882359411c652a.tar.gz | |
* ext/json/*, test/json/*: Reverted r50231. Because it's not works with
cross-compile environment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/rubygems_hook.rb')
| -rw-r--r-- | lib/rdoc/rubygems_hook.rb | 8 |
1 files changed, 2 insertions, 6 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 + |