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.
122 lines
1.9 KiB
Rust
122 lines
1.9 KiB
Rust
use crate::tests::{fail_test, run_test, TestResult};
|
|
|
|
#[test]
|
|
fn add_simple() -> TestResult {
|
|
run_test("3 + 4", "7")
|
|
}
|
|
|
|
#[test]
|
|
fn add_simple2() -> TestResult {
|
|
run_test("3 + 4 + 9", "16")
|
|
}
|
|
|
|
#[test]
|
|
fn broken_math() -> TestResult {
|
|
fail_test("3 + ", "incomplete")
|
|
}
|
|
|
|
#[test]
|
|
fn modulo1() -> TestResult {
|
|
run_test("5 mod 2", "1")
|
|
}
|
|
|
|
#[test]
|
|
fn modulo2() -> TestResult {
|
|
run_test("5.25 mod 2", "1.25")
|
|
}
|
|
|
|
#[test]
|
|
fn bit_shr() -> TestResult {
|
|
run_test("16 bit-shr 1", "8")
|
|
}
|
|
|
|
#[test]
|
|
fn bit_shl() -> TestResult {
|
|
run_test("5 bit-shl 1", "10")
|
|
}
|
|
|
|
#[test]
|
|
fn bit_shl_add() -> TestResult {
|
|
run_test("2 bit-shl 1 + 2", "16")
|
|
}
|
|
|
|
#[test]
|
|
fn sub_bit_shr() -> TestResult {
|
|
run_test("10 - 2 bit-shr 2", "2")
|
|
}
|
|
|
|
#[test]
|
|
fn and() -> TestResult {
|
|
run_test("true and false", "false")
|
|
}
|
|
|
|
#[test]
|
|
fn or() -> TestResult {
|
|
run_test("true or false", "true")
|
|
}
|
|
|
|
#[test]
|
|
fn xor_1() -> TestResult {
|
|
run_test("false xor true", "true")
|
|
}
|
|
|
|
#[test]
|
|
fn xor_2() -> TestResult {
|
|
run_test("true xor true", "false")
|
|
}
|
|
|
|
#[test]
|
|
fn bit_xor() -> TestResult {
|
|
run_test("4 bit-xor 4", "0")
|
|
}
|
|
|
|
#[test]
|
|
fn bit_xor_add() -> TestResult {
|
|
run_test("4 bit-xor 2 + 2", "0")
|
|
}
|
|
|
|
#[test]
|
|
fn bit_and() -> TestResult {
|
|
run_test("2 bit-and 4", "0")
|
|
}
|
|
|
|
#[test]
|
|
fn bit_or() -> TestResult {
|
|
run_test("2 bit-or 4", "6")
|
|
}
|
|
|
|
#[test]
|
|
fn bit_and_or() -> TestResult {
|
|
run_test("2 bit-or 4 bit-and 1 + 2", "2")
|
|
}
|
|
|
|
#[test]
|
|
fn pow() -> TestResult {
|
|
run_test("3 ** 3", "27")
|
|
}
|
|
|
|
#[test]
|
|
fn contains() -> TestResult {
|
|
run_test("'testme' =~ 'test'", "true")
|
|
}
|
|
|
|
#[test]
|
|
fn not_contains() -> TestResult {
|
|
run_test("'testme' !~ 'test'", "false")
|
|
}
|
|
|
|
#[test]
|
|
fn floating_add() -> TestResult {
|
|
run_test("10.1 + 0.8", "10.9")
|
|
}
|
|
|
|
#[test]
|
|
fn precedence_of_or_groups() -> TestResult {
|
|
run_test(r#"4 mod 3 == 0 or 5 mod 5 == 0"#, "true")
|
|
}
|
|
|
|
#[test]
|
|
fn test_filesize_op() -> TestResult {
|
|
run_test("-5kb + 4.5kb", "-500 B")
|
|
}
|