Ruby 2.7: Proc#<< and Proc#>> raises TypeError if passed not callable…

… object
oracle · Nov 19, 2020 · 1d9409d · 1d9409d
1 parent f6bd129
commit 1d9409d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ Compatibility:
 * Implement `Enumerator#produce` (#2160, @zverok)
 * Implement `Complex#<=>` (#2004, @ssnickolay).
 * Add warning for `proc` without block (#2004, @ssnickolay).
+* `Proc#<<` and `Proc#>>` raises TypeError if passed not callable object (#2004, @ssnickolay).
 
 Performance:
 

diff --git a/spec/tags/core/proc/compose_tags.txt b/spec/tags/core/proc/compose_tags.txt
diff --git a/src/main/ruby/truffleruby/core/proc.rb b/src/main/ruby/truffleruby/core/proc.rb
@@ -105,6 +105,8 @@ def to_proc
   end
 
   def >>(other)
+    raise(TypeError, 'callable object is expected') unless other.respond_to?(:call)
+
     if lambda?
       -> (*args, &block) do
         other.call(call(*args, &block))
@@ -117,6 +119,8 @@ def >>(other)
   end
 
   def <<(other)
+    raise(TypeError, 'callable object is expected') unless other.respond_to?(:call)
+
     if lambda?
       -> (*args, &block) do
         call(other.call(*args, &block))

diff --git a/test/mri/excludes/TestProc.rb b/test/mri/excludes/TestProc.rb
@@ -26,7 +26,6 @@
 exclude :test_proc_args_rest_post, "needs investigation"
 exclude :test_proc_args_rest_post_block, "needs investigation"
 exclude :test_safe, "needs investigation"
-exclude :test_compose_with_noncallable, "needs investigation"
 exclude :test_orphan_return, "needs investigation"
 exclude :test_proc_lambda, "needs investigation"
 exclude :test_proc_autosplat, "needs investigation"