From f234a0ea3357e3a6db3de240b57cd86a6acb25cb Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Thu, 25 Apr 2024 20:47:30 +0000
Subject: [PATCH] `each` signature fix (#12666)

# Description
Removes the second `Int` parameter from the closure in the signature of
`each`. This parameter doesn't exist / isn't supported.
---
 crates/nu-command/src/filters/each.rs | 48 ++++++++++++---------------
 src/tests/test_parser.rs              |  5 +--
 2 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/crates/nu-command/src/filters/each.rs b/crates/nu-command/src/filters/each.rs
index cbf89c805c..9767d83b56 100644
--- a/crates/nu-command/src/filters/each.rs
+++ b/crates/nu-command/src/filters/each.rs
@@ -40,7 +40,7 @@ with 'transpose' first."#
             ])
             .required(
                 "closure",
-                SyntaxShape::Closure(Some(vec![SyntaxShape::Any, SyntaxShape::Int])),
+                SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
                 "The closure to run.",
             )
             .switch("keep-empty", "keep empty result cells", Some('k'))
@@ -49,53 +49,47 @@ with 'transpose' first."#
     }
 
     fn examples(&self) -> Vec<Example> {
-        let stream_test_1 = vec![Value::test_int(2), Value::test_int(4), Value::test_int(6)];
-
-        let stream_test_2 = vec![
-            Value::nothing(Span::test_data()),
-            Value::test_string("found 2!"),
-            Value::nothing(Span::test_data()),
-        ];
-
         vec![
             Example {
                 example: "[1 2 3] | each {|e| 2 * $e }",
                 description: "Multiplies elements in the list",
-                result: Some(Value::list(stream_test_1, Span::test_data())),
+                result: Some(Value::test_list(vec![
+                    Value::test_int(2),
+                    Value::test_int(4),
+                    Value::test_int(6),
+                ])),
             },
             Example {
                 example: "{major:2, minor:1, patch:4} | values | each {|| into string }",
                 description: "Produce a list of values in the record, converted to string",
-                result: Some(Value::list(
-                    vec![
-                        Value::test_string("2"),
-                        Value::test_string("1"),
-                        Value::test_string("4"),
-                    ],
-                    Span::test_data(),
-                )),
+                result: Some(Value::test_list(vec![
+                    Value::test_string("2"),
+                    Value::test_string("1"),
+                    Value::test_string("4"),
+                ])),
             },
             Example {
                 example: r#"[1 2 3 2] | each {|e| if $e == 2 { "two" } }"#,
                 description: "Produce a list that has \"two\" for each 2 in the input",
-                result: Some(Value::list(
-                    vec![Value::test_string("two"), Value::test_string("two")],
-                    Span::test_data(),
-                )),
+                result: Some(Value::test_list(vec![
+                    Value::test_string("two"),
+                    Value::test_string("two"),
+                ])),
             },
             Example {
                 example: r#"[1 2 3] | enumerate | each {|e| if $e.item == 2 { $"found 2 at ($e.index)!"} }"#,
                 description:
                     "Iterate over each element, producing a list showing indexes of any 2s",
-                result: Some(Value::list(
-                    vec![Value::test_string("found 2 at 1!")],
-                    Span::test_data(),
-                )),
+                result: Some(Value::test_list(vec![Value::test_string("found 2 at 1!")])),
             },
             Example {
                 example: r#"[1 2 3] | each --keep-empty {|e| if $e == 2 { "found 2!"} }"#,
                 description: "Iterate over each element, keeping null results",
-                result: Some(Value::list(stream_test_2, Span::test_data())),
+                result: Some(Value::test_list(vec![
+                    Value::nothing(Span::test_data()),
+                    Value::test_string("found 2!"),
+                    Value::nothing(Span::test_data()),
+                ])),
             },
         ]
     }
diff --git a/src/tests/test_parser.rs b/src/tests/test_parser.rs
index d9a0bc794c..3d19f05a9c 100644
--- a/src/tests/test_parser.rs
+++ b/src/tests/test_parser.rs
@@ -416,10 +416,7 @@ fn proper_missing_param() -> TestResult {
 
 #[test]
 fn block_arity_check1() -> TestResult {
-    fail_test(
-        r#"ls | each { |x, y, z| 1}"#,
-        "expected 2 closure parameters",
-    )
+    fail_test(r#"ls | each { |x, y| 1}"#, "expected 1 closure parameter")
 }
 
 // deprecating former support for escapes like `/uNNNN`, dropping test.