[ruby/reline] Use IO's encoding instead of Encoding.default_external

(https://github.com/ruby/reline/pull/765)

* use IO's encoding

* refactoring

* remove unused encoding params

* (for retriggering CI) remove unused encoding params

https://github.com/ruby/reline/commit/f09772adab

6 files changed, 9 insertions, 10 deletions

diff --git a/test/reline/helper.rb b/test/reline/helper.rb
index 3d7dc7d812..015eb381ae 100644
--- a/test/reline/helper.rb
+++ b/test/reline/helper.rb
@@ -92,7 +92,7 @@ class Reline::TestCase < Test::Unit::TestCase
       if Reline::Unicode::EscapedChars.include?(c.ord)
         c
       else
-        c.encode(@line_editor.instance_variable_get(:@encoding), Encoding::UTF_8, **options)
+        c.encode(@line_editor.encoding, Encoding::UTF_8, **options)
       end
     }.join
   rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
diff --git a/test/reline/test_key_actor_emacs.rb b/test/reline/test_key_actor_emacs.rb
index 2ebd91dc2e..9256b7fe3b 100644
--- a/test/reline/test_key_actor_emacs.rb
+++ b/test/reline/test_key_actor_emacs.rb
@@ -9,8 +9,8 @@ class Reline::KeyActor::EmacsTest < Reline::TestCase
     Reline::HISTORY.instance_variable_set(:@config, @config)
     Reline::HISTORY.clear
     @encoding = Reline.core.encoding
-    @line_editor = Reline::LineEditor.new(@config, @encoding)
-    @line_editor.reset(@prompt, encoding: @encoding)
+    @line_editor = Reline::LineEditor.new(@config)
+    @line_editor.reset(@prompt)
   end
 
   def teardown
diff --git a/test/reline/test_key_actor_vi.rb b/test/reline/test_key_actor_vi.rb
index 07ca873ce3..9712ba89cc 100644
--- a/test/reline/test_key_actor_vi.rb
+++ b/test/reline/test_key_actor_vi.rb
@@ -9,8 +9,8 @@ class Reline::ViInsertTest < Reline::TestCase
       set editing-mode vi
     LINES
     @encoding = Reline.core.encoding
-    @line_editor = Reline::LineEditor.new(@config, @encoding)
-    @line_editor.reset(@prompt, encoding: @encoding)
+    @line_editor = Reline::LineEditor.new(@config)
+    @line_editor.reset(@prompt)
   end
 
   def editing_mode_label
diff --git a/test/reline/test_line_editor.rb b/test/reline/test_line_editor.rb
index 1859da8199..18fc2296ff 100644
--- a/test/reline/test_line_editor.rb
+++ b/test/reline/test_line_editor.rb
@@ -16,7 +16,7 @@ class Reline::LineEditor
 
     def setup
       verbose, $VERBOSE = $VERBOSE, nil
-      @line_editor = Reline::LineEditor.new(nil, Encoding::UTF_8)
+      @line_editor = Reline::LineEditor.new(nil)
       @original_iogate = Reline::IOGate
       @output = StringIO.new
       @line_editor.instance_variable_set(:@screen_size, [24, 80])
diff --git a/test/reline/test_macro.rb b/test/reline/test_macro.rb
index 04aa6474b4..319d7b76b1 100644
--- a/test/reline/test_macro.rb
+++ b/test/reline/test_macro.rb
@@ -5,7 +5,7 @@ class Reline::MacroTest < Reline::TestCase
     Reline.send(:test_mode)
     @config = Reline::Config.new
     @encoding = Reline.core.encoding
-    @line_editor = Reline::LineEditor.new(@config, @encoding)
+    @line_editor = Reline::LineEditor.new(@config)
     @output = @line_editor.output = File.open(IO::NULL, "w")
   end
 
diff --git a/test/reline/test_string_processing.rb b/test/reline/test_string_processing.rb
index c9b9e38643..a80e219522 100644
--- a/test/reline/test_string_processing.rb
+++ b/test/reline/test_string_processing.rb
@@ -6,9 +6,8 @@ class Reline::LineEditor::StringProcessingTest < Reline::TestCase
     @prompt = '> '
     @config = Reline::Config.new
     Reline::HISTORY.instance_variable_set(:@config, @config)
-    @encoding = Reline.core.encoding
-    @line_editor = Reline::LineEditor.new(@config, @encoding)
-    @line_editor.reset(@prompt, encoding: @encoding)
+    @line_editor = Reline::LineEditor.new(@config)
+    @line_editor.reset(@prompt)
   end
 
   def teardown