Ruby 2.7: Add warning for proc without block

oracle · Nov 17, 2020 · 696372a · 696372a
1 parent 001f1dc
commit 696372a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ Compatibility:
 * Implement `Enumerable#tally` and `Enumerable#filter_map` (#2144 and #2152, @LillianZ).
 * Implement `Range#minmax`.
 * Pass more `Enumerator::Lazy#uniq` and `Enumerator::Lazy#chunk` specs (#2146, @LillianZ).
+* Add warning for `proc` without block (#2004, @ssnickolay).
 
 Performance:
 

diff --git a/spec/tags/core/kernel/proc_tags.txt b/spec/tags/core/kernel/proc_tags.txt
diff --git a/src/main/java/org/truffleruby/core/proc/ProcNodes.java b/src/main/java/org/truffleruby/core/proc/ProcNodes.java
@@ -27,6 +27,7 @@
 import org.truffleruby.core.symbol.SymbolNodes;
 import org.truffleruby.language.NotProvided;
 import org.truffleruby.language.Visibility;
+import org.truffleruby.language.WarnNode;
 import org.truffleruby.language.arguments.ArgumentDescriptorUtils;
 import org.truffleruby.language.arguments.ReadCallerFrameNode;
 import org.truffleruby.language.arguments.RubyArguments;
@@ -62,7 +63,6 @@ protected RubyProc allocate(RubyClass rubyClass) {
 
     @CoreMethod(names = "new", constructor = true, needsBlock = true, rest = true)
     public abstract static class ProcNewNode extends CoreMethodArrayArgumentsNode {
-
         public static ProcNewNode create() {
             return ProcNodesFactory.ProcNewNodeFactory.create(null);
         }
@@ -73,14 +73,21 @@ public static ProcNewNode create() {
         protected RubyProc proc(VirtualFrame frame, RubyClass procClass, Object[] args, NotProvided block,
                 @Cached FindAndReadDeclarationVariableNode readNode,
                 @Cached ReadCallerFrameNode readCaller,
-                @Cached ProcNewNode recurseNode) {
+                @Cached ProcNewNode recurseNode,
+                @Cached("new()") WarnNode warnNode) {
             final MaterializedFrame parentFrame = readCaller.execute(frame);
 
             Object parentBlock = readNode.execute(parentFrame, TranslatorEnvironment.METHOD_BLOCK_NAME, nil);
 
             if (parentBlock == nil) {
                 throw new RaiseException(getContext(), coreExceptions().argumentErrorProcWithoutBlock(this));
             } else {
+                if (warnNode.shouldWarn()) {
+                    warnNode.warningMessage(
+                            getContext().getCallStack().getTopMostUserSourceSection(),
+                            "Capturing the given block using Kernel#proc is deprecated; use `&block` instead");
+                }
+
                 final RubyProc proc = (RubyProc) parentBlock;
                 return recurseNode.executeProcNew(frame, procClass, args, proc);
             }

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