Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions lib/rdoc/comment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,7 @@ def empty?
# HACK dubious

def encode! encoding
# TODO: Remove this condition after Ruby 2.2 EOL
if RUBY_VERSION < '2.3.0'
@text = @text.force_encoding encoding
else
@text = String.new @text, encoding: encoding
end
@text = String.new @text, encoding: encoding
self
end

Expand Down
7 changes: 1 addition & 6 deletions lib/rdoc/encoding.rb
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,7 @@ def self.change_encoding text, encoding
if text.kind_of? RDoc::Comment
text.encode! encoding
else
# TODO: Remove this condition after Ruby 2.2 EOL
if RUBY_VERSION < '2.3.0'
text.force_encoding encoding
else
String.new text, encoding: encoding
end
String.new text, encoding: encoding
end
end

Expand Down
8 changes: 2 additions & 6 deletions lib/rdoc/erbio.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,8 @@ class RDoc::ERBIO < ERB
##
# Defaults +eoutvar+ to 'io', otherwise is identical to ERB's initialize

def initialize str, safe_level = nil, legacy_trim_mode = nil, legacy_eoutvar = 'io', trim_mode: nil, eoutvar: 'io'
if RUBY_VERSION >= '2.6'
super(str, trim_mode: trim_mode, eoutvar: eoutvar)
else
super(str, safe_level, legacy_trim_mode, legacy_eoutvar)
end
def initialize str, trim_mode: nil, eoutvar: 'io'
super(str, trim_mode: trim_mode, eoutvar: eoutvar)
end

##
Expand Down
6 changes: 1 addition & 5 deletions lib/rdoc/generator/darkfish.rb
Original file line number Diff line number Diff line change
Expand Up @@ -778,11 +778,7 @@ def template_for file, page = true, klass = ERB
erbout = "_erbout_#{file_var}"
end

if RUBY_VERSION >= '2.6'
template = klass.new template, trim_mode: '-', eoutvar: erbout
else
template = klass.new template, nil, '-', erbout
end
template = klass.new template, trim_mode: '-', eoutvar: erbout
@template_cache[file] = template
template
end
Expand Down