[Truffle] Remove 1.8 behaviour in Rubinius' String#include?

jruby · Jan 5, 2015 · fe45893 · fe45893
1 parent 6e85813
commit fe45893
Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/string.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/string.rb
@@ -29,14 +29,7 @@
 class String
 
   def include?(needle)
-    if needle.kind_of? Fixnum
-      needle = needle % 256
-      str_needle = needle.chr
-    else
-      str_needle = StringValue(needle)
-    end
-
-    !!find_string(str_needle, 0)
+    !!find_string(StringValue(needle), 0)
   end
 
 end
diff --git a/spec/ruby/core/string/include_spec.rb b/spec/ruby/core/string/include_spec.rb
@@ -22,6 +22,7 @@
 
   it "raises a TypeError if other can't be converted to string" do
     lambda { "hello".include?([])       }.should raise_error(TypeError)
+    lambda { "hello".include?('h'.ord)  }.should raise_error(TypeError)
     lambda { "hello".include?(mock('x')) }.should raise_error(TypeError)
   end
 end