mirror of
https://github.com/nushell/nushell.git
synced 2025-08-09 07:05:47 +02:00
Replace row conditions with closures in commands (#7428)
# Description This PR changes some commands that previously accepted row conditions (like `$it > 5`) as parameter to accept closures instead. The reasons are: a) The commands would need to move into parser keywords in the future while they feel more like commands to be implemented in Nushell code as a part of standard library. b) In scripts, it is useful to store the predicate condition in a variable which you can't do with row conditions. c) These commands are not used that often to benefit enough from the shorter row condition syntax # User-Facing Changes The following commands now accept **closure** instead of a **row condition**: - `take until` - `take while` - `skip until` - `skip while` - `any` - `all` This is a part of an effort to move away from shape-directed parsing. Related PR: https://github.com/nushell/nushell/pull/7365 # 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.
This commit is contained in:
@ -6,7 +6,7 @@ fn checks_all_rows_are_true() {
|
||||
cwd: ".", pipeline(
|
||||
r#"
|
||||
echo [ "Andrés", "Andrés", "Andrés" ]
|
||||
| all $it == "Andrés"
|
||||
| all {|it| $it == "Andrés" }
|
||||
"#
|
||||
));
|
||||
|
||||
@ -49,7 +49,7 @@ fn checks_all_columns_of_a_table_is_true() {
|
||||
[ Darren, Schroeder, 10/11/2013, 1 ]
|
||||
[ Yehuda, Katz, 10/11/2013, 1 ]
|
||||
]
|
||||
| all likes > 0
|
||||
| all {|x| $x.likes > 0 }
|
||||
"#
|
||||
));
|
||||
|
||||
@ -61,7 +61,7 @@ fn checks_if_all_returns_error_with_invalid_command() {
|
||||
let actual = nu!(
|
||||
cwd: ".", pipeline(
|
||||
r#"
|
||||
[red orange yellow green blue purple] | all ($it | st length) > 4
|
||||
[red orange yellow green blue purple] | all {|it| ($it | st length) > 4 }
|
||||
"#
|
||||
));
|
||||
|
||||
|
@ -6,7 +6,7 @@ fn checks_any_row_is_true() {
|
||||
cwd: ".", pipeline(
|
||||
r#"
|
||||
echo [ "Ecuador", "USA", "New Zealand" ]
|
||||
| any $it == "New Zealand"
|
||||
| any {|it| $it == "New Zealand" }
|
||||
"#
|
||||
));
|
||||
|
||||
@ -25,7 +25,7 @@ fn checks_any_column_of_a_table_is_true() {
|
||||
[ Darren, Schroeder, 10/11/2013, 1 ]
|
||||
[ Yehuda, Katz, 10/11/2013, 1 ]
|
||||
]
|
||||
| any rusty_at == 10/12/2013
|
||||
| any {|x| $x.rusty_at == 10/12/2013 }
|
||||
"#
|
||||
));
|
||||
|
||||
@ -37,7 +37,7 @@ fn checks_if_any_returns_error_with_invalid_command() {
|
||||
let actual = nu!(
|
||||
cwd: ".", pipeline(
|
||||
r#"
|
||||
[red orange yellow green blue purple] | any ($it | st length) > 4
|
||||
[red orange yellow green blue purple] | any {|it| ($it | st length) > 4 }
|
||||
"#
|
||||
));
|
||||
|
||||
|
@ -7,7 +7,7 @@ fn lines() {
|
||||
r#"
|
||||
open cargo_sample.toml -r
|
||||
| lines
|
||||
| skip while $it != "[dependencies]"
|
||||
| skip while {|it| $it != "[dependencies]" }
|
||||
| skip 1
|
||||
| first
|
||||
| split column "="
|
||||
|
@ -38,7 +38,7 @@ fn condition_is_met() {
|
||||
| str trim
|
||||
| str join (char nl)
|
||||
| from csv
|
||||
| skip until "Chicken Collection" == "Red Chickens"
|
||||
| skip until {|row| $row."Chicken Collection" == "Red Chickens" }
|
||||
| skip 1
|
||||
| into int "31/04/2020"
|
||||
| get "31/04/2020"
|
||||
|
@ -38,7 +38,7 @@ fn condition_is_met() {
|
||||
| str trim
|
||||
| str join (char nl)
|
||||
| from csv
|
||||
| skip while "Chicken Collection" != "Red Chickens"
|
||||
| skip while {|row| $row."Chicken Collection" != "Red Chickens" }
|
||||
| skip 1
|
||||
| into int "31/04/2020"
|
||||
| get "31/04/2020"
|
||||
|
@ -38,8 +38,8 @@ fn condition_is_met() {
|
||||
| str trim
|
||||
| str join (char nl)
|
||||
| from csv
|
||||
| skip while "Chicken Collection" != "Blue Chickens"
|
||||
| take until "Chicken Collection" == "Red Chickens"
|
||||
| skip while {|row| $row."Chicken Collection" != "Blue Chickens" }
|
||||
| take until {|row| $row."Chicken Collection" == "Red Chickens" }
|
||||
| skip 1
|
||||
| into int "31/04/2020"
|
||||
| get "31/04/2020"
|
||||
|
@ -39,7 +39,7 @@ fn condition_is_met() {
|
||||
| str join (char nl)
|
||||
| from csv
|
||||
| skip 1
|
||||
| take while "Chicken Collection" != "Blue Chickens"
|
||||
| take while {|row| $row."Chicken Collection" != "Blue Chickens"}
|
||||
| into int "31/04/2020"
|
||||
| get "31/04/2020"
|
||||
| math sum
|
||||
|
Reference in New Issue
Block a user