Remove deprecated --numbered flag from four commands (#7777)

# Description

Remove `--numbered` from ~~`for`~~, `each`, `par-each`, `reduce` and
`each while`. These all provide indexes (numbering) via the optional
second param to their closures.

EDIT: Closes #6986.

# User-Facing Changes

Every command that had `--numbered` listed as "deprecated" in their help
docs is affected.

# Tests + Formatting

Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass

# After Submitting

If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
This commit is contained in:
Leon
2023-02-03 08:59:58 +10:00
committed by GitHub
parent 215ed141e7
commit 9945241b77
24 changed files with 202 additions and 541 deletions

View File

@ -109,10 +109,10 @@ fn early_exits_with_0_param_blocks() {
}
#[test]
fn uses_optional_index_argument() {
fn all_uses_enumerate_index() {
let actual = nu!(
cwd: ".", pipeline(
r#"[7 8 9] | all {|el ind| print $ind | true }"#
r#"[7 8 9] | enumerate | all {|el| print $el.index | true }"#
));
assert_eq!(actual.out, "012true");

View File

@ -85,10 +85,10 @@ fn early_exits_with_0_param_blocks() {
}
#[test]
fn uses_optional_index_argument() {
fn any_uses_enumerate_index() {
let actual = nu!(
cwd: ".", pipeline(
r#"[7 8 9] | any {|el ind| print $ind | false }"#
r#"[7 8 9] | enumerate | any {|el| print $el.index | false }"#
));
assert_eq!(actual.out, "012false");

View File

@ -73,20 +73,20 @@ fn each_implicit_it_in_block() {
}
#[test]
fn uses_optional_index_argument() {
fn each_uses_enumerate_index() {
let actual = nu!(
cwd: ".", pipeline(
r#"[7 8 9 10] | each {|el ind| $ind } | to nuon"#
r#"[7 8 9 10] | enumerate | each {|el| $el.index } | to nuon"#
));
assert_eq!(actual.out, "[0, 1, 2, 3]");
}
#[test]
fn each_while_uses_optional_index_argument() {
fn each_while_uses_enumerate_index() {
let actual = nu!(
cwd: ".", pipeline(
r#"[7 8 9 10] | each while {|el ind| $ind } | to nuon"#
r#"[7 8 9 10] | enumerate | each while {|el| $el.index } | to nuon"#
));
assert_eq!(actual.out, "[0, 1, 2, 3]");

View File

@ -87,11 +87,11 @@ fn insert_past_end_list() {
}
#[test]
fn uses_optional_index_argument() {
fn insert_uses_enumerate_index() {
let actual = nu!(
cwd: ".", pipeline(
r#"[[a]; [7] [6]] | insert b {|el ind| $ind + 1 + $el.a } | to nuon"#
r#"[[a]; [7] [6]] | enumerate | insert b {|el| $el.index + 1 + $el.item.a } | flatten | to nuon"#
));
assert_eq!(actual.out, "[[a, b]; [7, 8], [6, 8]]");
assert_eq!(actual.out, "[[index, a, b]; [0, 7, 8], [1, 6, 8]]");
}

View File

@ -47,12 +47,12 @@ fn reduce_rows_example() {
}
#[test]
fn reduce_numbered_example() {
fn reduce_enumerate_example() {
let actual = nu!(
cwd: ".", pipeline(
r#"
echo one longest three bar
| reduce -n { |it, acc| if ($it.item | str length) > ($acc.item | str length) {echo $it} else {echo $acc}}
echo one longest three bar | enumerate
| reduce { |it, acc| if ($it.item | str length) > ($acc.item | str length) {echo $it} else {echo $acc}}
| get index
"#
)
@ -62,12 +62,14 @@ fn reduce_numbered_example() {
}
#[test]
fn reduce_numbered_integer_addition_example() {
fn reduce_enumerate_integer_addition_example() {
let actual = nu!(
cwd: ".", pipeline(
r#"
echo [1 2 3 4]
| reduce -n { |it, acc| $acc.item + $it.item }
| enumerate
| reduce { |it, acc| { index: ($it.index) item: ($acc.item + $it.item)} }
| get item
"#
)
);
@ -121,11 +123,14 @@ fn error_reduce_empty() {
}
#[test]
fn uses_optional_index_argument() {
fn enumerate_reduce_example() {
let actual = nu!(
cwd: ".", pipeline(
r#"[18 19 20] | reduce -f 0 {|elem accum index| $accum + $index } | to nuon"#
));
r#"
[one longest three bar] | enumerate | reduce {|it, acc| if ($it.item | str length) > ($acc.item | str length) { $it } else { $acc }} | get index
"#
)
);
assert_eq!(actual.out, "3");
assert_eq!(actual.out, "1");
}

View File

@ -135,7 +135,8 @@ mod columns {
transpose bit --ignore-titles
| get bit
| reverse
| each --numbered { |it|
| enumerate
| each { |it|
$it.item * (2 ** $it.index)
}
| math sum

View File

@ -116,11 +116,11 @@ fn update_nonexistent_column() {
}
#[test]
fn uses_optional_index_argument() {
fn update_uses_enumerate_index() {
let actual = nu!(
cwd: ".", pipeline(
r#"[[a]; [7] [6]] | update a {|el ind| $ind + 1 + $el.a } | to nuon"#
r#"[[a]; [7] [6]] | enumerate | update item.a {|el| $el.index + 1 + $el.item.a } | flatten | to nuon"#
));
assert_eq!(actual.out, "[[a]; [8], [8]]");
assert_eq!(actual.out, "[[index, a]; [0, 8], [1, 8]]");
}

View File

@ -69,23 +69,23 @@ fn sets_the_column_from_a_subexpression() {
}
#[test]
fn uses_optional_index_argument_inserting() {
fn upsert_uses_enumerate_index_inserting() {
let actual = nu!(
cwd: ".", pipeline(
r#"[[a]; [7] [6]] | upsert b {|el ind| $ind + 1 + $el.a } | to nuon"#
r#"[[a]; [7] [6]] | enumerate | upsert b {|el| $el.index + 1 + $el.item.a } | flatten | to nuon"#
));
assert_eq!(actual.out, "[[a, b]; [7, 8], [6, 8]]");
assert_eq!(actual.out, "[[index, a, b]; [0, 7, 8], [1, 6, 8]]");
}
#[test]
fn uses_optional_index_argument_updating() {
fn upsert_uses_enumerate_index_updating() {
let actual = nu!(
cwd: ".", pipeline(
r#"[[a]; [7] [6]] | upsert a {|el ind| $ind + 1 + $el.a } | to nuon"#
r#"[[a]; [7] [6]] | enumerate | upsert a {|el| $el.index + 1 + $el.item.a } | flatten | to nuon"#
));
assert_eq!(actual.out, "[[a]; [8], [8]]");
assert_eq!(actual.out, "[[index, a]; [0, 8], [1, 8]]");
}
#[test]

View File

@ -82,13 +82,13 @@ fn where_not_in_table() {
}
#[test]
fn uses_optional_index_argument() {
fn where_uses_enumerate_index() {
let actual = nu!(
cwd: ".",
r#"[7 8 9 10] | where {|el ind| $ind < 2 } | to nuon"#
r#"[7 8 9 10] | enumerate | where {|el| $el.index < 2 } | to nuon"#
);
assert_eq!(actual.out, "[7, 8]");
assert_eq!(actual.out, "[[index, item]; [0, 7], [1, 8]]");
}
#[cfg(feature = "sqlite")]