[Truffle] Backported a String#scrub fix from Rubinius 2.5.0.

jruby · Apr 3, 2015 · c2146b2 · c2146b2 · nirvdrum · Apr 3, 2015
1 parent 4f50d0a
commit c2146b2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/spec/truffle/tags/core/string/scrub_tags.txt b/spec/truffle/tags/core/string/scrub_tags.txt
@@ -1,2 +1 @@
 fails(needs unpack):String#scrub with a block replaces invalid byte sequences
-fails(inherited - rubinius):String#scrub with a block replaces invalid byte sequences using a custom encoding
diff --git a/truffle/src/main/ruby/core/rubinius/common/string.rb b/truffle/src/main/ruby/core/rubinius/common/string.rb
@@ -1948,6 +1948,12 @@ def scrub(replace = nil)
       replace = replace.force_encoding(Encoding::BINARY)
     end
 
+    # MRI appears to just return a copy of self when the input encoding is
+    # BINARY/ASCII_8BIT.
+    if input.encoding == Encoding::BINARY
+      return input
+    end
+
     converter = Encoding::Converter.new(input.encoding, Encoding::BINARY)
 
     while input.length > 0
@@ -1958,8 +1964,12 @@ def scrub(replace = nil)
       elsif result == :undefined_conversion
         output << converter.primitive_errinfo[3]
       else
+        # Blocks can return strings in any encoding so we'll make sure it's the
+        # same as our buffer for the mean time.
         if block_given?
-          output << yield(converter.primitive_errinfo[3])
+          block_output = yield(converter.primitive_errinfo[3])
+
+          output << block_output.force_encoding(output.encoding)
         else
           output << replace
         end