forked from extern/nushell
379e3d70ca
# Description Adds improved errors for when a user uses a bashism that nu doesn't support. fixes #7237 Examples: ``` Error: nu::parser::shell_andand (link) × The '&&' operator is not supported in Nushell ╭─[entry #1:1:1] 1 │ ls && ls · ─┬ · ╰── instead of '&&', use ';' or 'and' ╰──── help: use ';' instead of the shell '&&', or 'and' instead of the boolean '&&' ``` ``` Error: nu::parser::shell_oror (link) × The '||' operator is not supported in Nushell ╭─[entry #8:1:1] 1 │ ls || ls · ─┬ · ╰── instead of '||', use 'try' or 'or' ╰──── help: use 'try' instead of the shell '||', or 'or' instead of the boolean '||' ``` ``` Error: nu::parser::shell_err (link) × The '2>' shell operation is 'err>' in Nushell. ╭─[entry #9:1:1] 1 │ foo 2> bar.txt · ─┬ · ╰── use 'err>' instead of '2>' in Nushell ╰──── ``` ``` Error: nu::parser::shell_outerr (link) × The '2>&1' shell operation is 'out+err>' in Nushell. ╭─[entry #10:1:1] 1 │ foo 2>&1 bar.txt · ──┬─ · ╰── use 'out+err>' instead of '2>&1' in Nushell ╰──── help: Nushell redirection will write all of stdout before stderr. ``` # User-Facing Changes **BREAKING CHANGES** This removes the `&&` and `||` operators. We previously supported by `&&`/`and` and `||`/`or`. With this change, only `and` and `or` are valid boolean operators. # 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.
60 lines
1.4 KiB
Rust
60 lines
1.4 KiB
Rust
use nu_test_support::fs::Stub::FileWithContent;
|
|
use nu_test_support::playground::Playground;
|
|
use nu_test_support::{nu, pipeline};
|
|
|
|
const ZIP_POWERED_TEST_ASSERTION_SCRIPT: &str = r#"
|
|
export def expect [
|
|
left,
|
|
--to-eq,
|
|
right
|
|
] {
|
|
$left | zip $right | all {|row|
|
|
$row.name.0 == $row.name.1 and $row.commits.0 == $row.commits.1
|
|
}
|
|
}
|
|
"#;
|
|
|
|
#[test]
|
|
fn zips_two_tables() {
|
|
Playground::setup("zip_test_1", |dirs, nu| {
|
|
nu.with_files(vec![FileWithContent(
|
|
"zip_test.nu",
|
|
&format!("{}\n", ZIP_POWERED_TEST_ASSERTION_SCRIPT),
|
|
)]);
|
|
|
|
let actual = nu!(
|
|
cwd: ".", pipeline(
|
|
&format!(
|
|
r#"
|
|
use {} expect ;
|
|
|
|
let contributors = ([
|
|
[name, commits];
|
|
[andres, 10]
|
|
[ jt, 20]
|
|
]);
|
|
|
|
let actual = ($contributors | upsert commits {{ |i| ($i.commits + 10) }});
|
|
|
|
expect $actual --to-eq [[name, commits]; [andres, 20] [jt, 30]]
|
|
"#,
|
|
dirs.test().join("zip_test.nu").display()
|
|
)
|
|
));
|
|
|
|
assert_eq!(actual.out, "true");
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn zips_two_lists() {
|
|
let actual = nu!(
|
|
cwd: ".", pipeline(
|
|
r#"
|
|
echo [0 2 4 6 8] | zip [1 3 5 7 9] | flatten | into string | str join '-'
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "0-1-2-3-4-5-6-7-8-9");
|
|
}
|