Compact ensure clause and rename variables to fix alignment

1 files changed, 19 insertions, 23 deletions

diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index f91b8c89d1..247e4a7607 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -117,23 +117,23 @@ class TestIO < Test::Unit::TestCase
     EnvUtil.with_default_internal(Encoding::UTF_8) do
       EnvUtil.with_default_external(Encoding::UTF_8) do
         begin
-          reader, writer = IO.pipe
-          reader.binmode
-          writer.binmode
+          reader0, writer0 = IO.pipe
+          reader0.binmode
+          writer0.binmode
 
           reader1, writer1 = IO.pipe
 
           reader2, writer2 = IO.pipe(binmode: true)
-          assert_predicate writer, :binmode?
+          assert_predicate writer0, :binmode?
           assert_predicate writer2, :binmode?
-          assert_equal writer.binmode?, writer2.binmode?
-          assert_equal writer.external_encoding, writer2.external_encoding
-          assert_equal writer.internal_encoding, writer2.internal_encoding
-          assert_predicate reader, :binmode?
+          assert_equal writer0.binmode?, writer2.binmode?
+          assert_equal writer0.external_encoding, writer2.external_encoding
+          assert_equal writer0.internal_encoding, writer2.internal_encoding
+          assert_predicate reader0, :binmode?
           assert_predicate reader2, :binmode?
-          assert_equal reader.binmode?, reader2.binmode?
-          assert_equal reader.external_encoding, reader2.external_encoding
-          assert_equal reader.internal_encoding, reader2.internal_encoding
+          assert_equal reader0.binmode?, reader2.binmode?
+          assert_equal reader0.external_encoding, reader2.external_encoding
+          assert_equal reader0.internal_encoding, reader2.internal_encoding
 
           reader3, writer3 = IO.pipe("UTF-8:UTF-8", binmode: true)
           assert_predicate writer3, :binmode?
@@ -159,18 +159,14 @@ class TestIO < Test::Unit::TestCase
           assert_equal reader1.external_encoding, reader5.external_encoding
           assert_equal reader1.internal_encoding, reader5.internal_encoding
         ensure
-          reader.close if reader
-          writer.close if writer
-          reader1.close if reader1
-          writer1.close if writer1
-          reader2.close if reader2
-          writer2.close if writer2
-          reader3.close if reader3
-          writer3.close if writer3
-          reader4.close if reader4
-          writer4.close if writer4
-          reader5.close if reader5
-          writer5.close if writer5
+          [
+            reader0, writer0,
+            reader1, writer1,
+            reader2, writer2,
+            reader3, writer3,
+            reader4, writer4,
+            reader5, writer5,
+          ].compact.map(&:close)
         end
       end
     end