diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-07 22:23:38 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-07 22:23:38 +0000 |
| commit | ba6ae341bab83dfc7a624c5bf20d8d162dacaff9 (patch) | |
| tree | 540581a54cefcdc817577f646f09372f7e9936d1 /lib/rdoc/rdoc.rb | |
| parent | bf51c067b92361007a57909c539591d3d00cdbd8 (diff) | |
* 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
Diffstat (limited to 'lib/rdoc/rdoc.rb')
| -rw-r--r-- | lib/rdoc/rdoc.rb | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb index 89ba6619aa..ec50d8eba5 100644 --- a/lib/rdoc/rdoc.rb +++ b/lib/rdoc/rdoc.rb @@ -340,10 +340,8 @@ option) # Parses +filename+ and returns an RDoc::TopLevel def parse_file filename - if Object.const_defined? :Encoding then - encoding = @options.encoding - filename = filename.encode encoding - end + encoding = @options.encoding + filename = filename.encode encoding @stats.add_file filename @@ -553,16 +551,14 @@ end begin require 'rubygems' - if Gem.respond_to? :find_files then - rdoc_extensions = Gem.find_files 'rdoc/discover' + rdoc_extensions = Gem.find_files 'rdoc/discover' - rdoc_extensions.each do |extension| - begin - load extension - rescue => e - warn "error loading #{extension.inspect}: #{e.message} (#{e.class})" - warn "\t#{e.backtrace.join "\n\t"}" if $DEBUG - end + rdoc_extensions.each do |extension| + begin + load extension + rescue => e + warn "error loading #{extension.inspect}: #{e.message} (#{e.class})" + warn "\t#{e.backtrace.join "\n\t"}" if $DEBUG end end rescue LoadError @@ -572,4 +568,3 @@ end require 'rdoc/generator/darkfish' require 'rdoc/generator/ri' require 'rdoc/generator/pot' - |