extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-22 00:13:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

each signature fix (#12666)

Browse Source 
# Description
Removes the second `Int` parameter from the closure in the signature of
`each`. This parameter doesn't exist / isn't supported.
This commit is contained in:
Ian Manske 2024-04-25 20:47:30 +00:00 committed by GitHub
parent 2466a39574
commit f234a0ea33
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
crates/nu-command/src/filters/each.rs
View File

@ -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()),
])),
},
]
}

5
src/tests/test_parser.rs
View File

@ -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.