Skip to content

Commit

Permalink
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions spec/truffle/tags/core/encoding/converter/new_tags.txt

This file was deleted.

2 changes: 1 addition & 1 deletion truffle/src/main/ruby/core/encoding.rb
Original file line number Diff line number Diff line change
@@ -228,13 +228,13 @@ def initialize(from, to, options=undefined)
@replacement_converters << name << converters
end
end
initialize_jruby(*[@source_encoding, @destination_encoding, @options])
end

alias_method :initialize_rubinius, :initialize

def initialize(*args)
initialize_rubinius(*args)
initialize_jruby(*args)
end

def convert(str)

2 comments on commit f10f15e

@nirvdrum
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks odd to me. If you've just moved the initialize_jruby call into initialize_rubinius, do we really need to alias the method then redefine it to call the original method again?

@bjfish
Copy link
Contributor

@bjfish bjfish commented on f10f15e Aug 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nirvdrum Fixed at 9f3d164 , Thanks

Please sign in to comment.