mirror of
https://github.com/nushell/nushell.git
synced 2025-06-30 14:40:06 +02:00
remove let-env, focus on mutating $env (#9574)
# Description For years, Nushell has used `let-env` to set a single environment variable. As our work on scoping continued, we refined what it meant for a variable to be in scope using `let` but never updated how `let-env` would work. Instead, `let-env` confusingly created mutations to the command's copy of `$env`. So, to help fix the mental model and point people to the right way of thinking about what changing the environment means, this PR removes `let-env` to encourage people to think of it as updating the command's environment variable via mutation. Before: ``` let-env FOO = "BAR" ``` Now: ``` $env.FOO = "BAR" ``` It's also a good reminder that the environment owned by the command is in the `$env` variable rather than global like it is in other shells. # User-Facing Changes BREAKING CHANGE BREAKING CHANGE This completely removes `let-env FOO = "BAR"` so that we can focus on `$env.FOO = "BAR"`. # 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 -A clippy::result_large_err` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass - `cargo run -- crates/nu-std/tests/run.nu` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After / Before Submitting integration scripts to update: - ✔️ [starship](https://github.com/starship/starship/blob/master/src/init/starship.nu) - ✔️ [virtualenv](https://github.com/pypa/virtualenv/blob/main/src/virtualenv/activation/nushell/activate.nu) - ✔️ [atuin](https://github.com/ellie/atuin/blob/main/atuin/src/shell/atuin.nu) (PR: https://github.com/ellie/atuin/pull/1080) - ❌ [zoxide](https://github.com/ajeetdsouza/zoxide/blob/main/templates/nushell.txt) (PR: https://github.com/ajeetdsouza/zoxide/pull/587) - ✔️ [oh-my-posh](https://github.com/JanDeDobbeleer/oh-my-posh/blob/main/src/shell/scripts/omp.nu) (pr: https://github.com/JanDeDobbeleer/oh-my-posh/pull/4011)
This commit is contained in:
@ -230,7 +230,7 @@ fn parse_module_success_2() {
|
||||
r#"
|
||||
# foo.nu
|
||||
|
||||
export-env { let-env MYNAME = "Arthur, King of the Britons" }
|
||||
export-env { $env.MYNAME = "Arthur, King of the Britons" }
|
||||
"#,
|
||||
)]);
|
||||
|
||||
@ -749,7 +749,7 @@ fn parse_script_with_nested_scripts_success() {
|
||||
.with_files(vec![FileWithContentToBeTrimmed(
|
||||
"foo.nu",
|
||||
r#"
|
||||
let-env FOO = 'foo'
|
||||
$env.FOO = 'foo'
|
||||
"#,
|
||||
)]);
|
||||
|
||||
@ -772,7 +772,7 @@ fn nu_check_respects_file_pwd() {
|
||||
.with_files(vec![FileWithContentToBeTrimmed(
|
||||
"lol/lol.nu",
|
||||
r#"
|
||||
let-env RETURN = (nu-check ../foo.nu)
|
||||
$env.RETURN = (nu-check ../foo.nu)
|
||||
"#,
|
||||
)])
|
||||
.with_files(vec![FileWithContentToBeTrimmed(
|
||||
|
@ -143,7 +143,7 @@ fn same_target_redirection_with_too_much_stderr_not_hang_nushell() {
|
||||
nu!(
|
||||
cwd: dirs.test(), pipeline(
|
||||
r#"
|
||||
let-env LARGE = (open --raw a_large_file.txt);
|
||||
$env.LARGE = (open --raw a_large_file.txt);
|
||||
nu --testbin echo_env_stderr LARGE out+err> another_large_file.txt
|
||||
"#
|
||||
),
|
||||
|
@ -142,7 +142,7 @@ fn errors_if_attempting_to_delete_home() {
|
||||
Playground::setup("rm_test_8", |dirs, _| {
|
||||
let actual = nu!(
|
||||
cwd: dirs.root(),
|
||||
"let-env HOME = myhome ; rm -rf ~"
|
||||
"$env.HOME = myhome ; rm -rf ~"
|
||||
);
|
||||
|
||||
assert!(actual.err.contains("please use -I or -i"));
|
||||
|
@ -91,8 +91,8 @@ fn save_stderr_and_stdout_to_afame_file() {
|
||||
let actual = nu!(
|
||||
cwd: dirs.root(),
|
||||
r#"
|
||||
let-env FOO = "bar";
|
||||
let-env BAZ = "ZZZ";
|
||||
$env.FOO = "bar";
|
||||
$env.BAZ = "ZZZ";
|
||||
do -c {nu -c 'nu --testbin echo_env FOO; nu --testbin echo_env_stderr BAZ'} | save -r save_test_5/new-file.txt --stderr save_test_5/new-file.txt
|
||||
"#,
|
||||
);
|
||||
@ -113,8 +113,8 @@ fn save_stderr_and_stdout_to_diff_file() {
|
||||
nu!(
|
||||
cwd: dirs.root(),
|
||||
r#"
|
||||
let-env FOO = "bar";
|
||||
let-env BAZ = "ZZZ";
|
||||
$env.FOO = "bar";
|
||||
$env.BAZ = "ZZZ";
|
||||
do -c {nu -c 'nu --testbin echo_env FOO; nu --testbin echo_env_stderr BAZ'} | save -r save_test_6/log.txt --stderr save_test_6/err.txt
|
||||
"#,
|
||||
);
|
||||
@ -206,8 +206,8 @@ fn save_append_works_on_stderr() {
|
||||
nu!(
|
||||
cwd: dirs.root(),
|
||||
r#"
|
||||
let-env FOO = " New";
|
||||
let-env BAZ = " New Err";
|
||||
$env.FOO = " New";
|
||||
$env.BAZ = " New Err";
|
||||
do -i {nu -c 'nu --testbin echo_env FOO; nu --testbin echo_env_stderr BAZ'} | save -a -r save_test_11/log.txt --stderr save_test_11/err.txt"#,
|
||||
);
|
||||
|
||||
@ -227,8 +227,8 @@ fn save_not_overrides_err_by_default() {
|
||||
let actual = nu!(
|
||||
cwd: dirs.root(),
|
||||
r#"
|
||||
let-env FOO = " New";
|
||||
let-env BAZ = " New Err";
|
||||
$env.FOO = " New";
|
||||
$env.BAZ = " New Err";
|
||||
do -i {nu -c 'nu --testbin echo_env FOO; nu --testbin echo_env_stderr BAZ'} | save -r save_test_12/log.txt --stderr save_test_12/err.txt"#,
|
||||
);
|
||||
|
||||
@ -250,8 +250,8 @@ fn save_override_works_stderr() {
|
||||
nu!(
|
||||
cwd: dirs.root(),
|
||||
r#"
|
||||
let-env FOO = "New";
|
||||
let-env BAZ = "New Err";
|
||||
$env.FOO = "New";
|
||||
$env.BAZ = "New Err";
|
||||
do -i {nu -c 'nu --testbin echo_env FOO; nu --testbin echo_env_stderr BAZ'} | save -f -r save_test_13/log.txt --stderr save_test_13/err.txt"#,
|
||||
);
|
||||
|
||||
|
@ -31,7 +31,7 @@ fn sources_also_files_under_custom_lib_dirs_path() {
|
||||
nu.within("lib/my_library").with_files(vec![FileWithContent(
|
||||
"main.nu",
|
||||
r#"
|
||||
let-env hello = "hello nu"
|
||||
$env.hello = "hello nu"
|
||||
"#,
|
||||
)]);
|
||||
|
||||
@ -163,7 +163,7 @@ fn source_env_eval_export_env() {
|
||||
sandbox.with_files(vec![FileWithContentToBeTrimmed(
|
||||
"spam.nu",
|
||||
r#"
|
||||
export-env { let-env FOO = 'foo' }
|
||||
export-env { $env.FOO = 'foo' }
|
||||
"#,
|
||||
)]);
|
||||
|
||||
@ -186,7 +186,7 @@ fn source_env_eval_export_env_hide() {
|
||||
)]);
|
||||
|
||||
let inp = &[
|
||||
r#"let-env FOO = 'foo'"#,
|
||||
r#"$env.FOO = 'foo'"#,
|
||||
r#"source-env spam.nu"#,
|
||||
r#"$env.FOO"#,
|
||||
];
|
||||
@ -299,7 +299,7 @@ fn source_env_const_file() {
|
||||
sandbox.with_files(vec![FileWithContentToBeTrimmed(
|
||||
"spam.nu",
|
||||
r#"
|
||||
let-env FOO = 'foo'
|
||||
$env.FOO = 'foo'
|
||||
"#,
|
||||
)]);
|
||||
|
||||
|
@ -38,7 +38,7 @@ fn table_collapse_0() {
|
||||
#[test]
|
||||
fn table_collapse_basic() {
|
||||
let actual = nu!(nu_repl_code(&[
|
||||
"let-env config = { table: { mode: basic }};",
|
||||
"$env.config = { table: { mode: basic }};",
|
||||
"[[a b, c]; [1 2 3] [4 5 [1 2 3]]] | table --collapse"
|
||||
]));
|
||||
assert_eq!(
|
||||
@ -60,7 +60,7 @@ fn table_collapse_basic() {
|
||||
#[test]
|
||||
fn table_collapse_heavy() {
|
||||
let actual = nu!(nu_repl_code(&[
|
||||
"let-env config = { table: { mode: heavy }};",
|
||||
"$env.config = { table: { mode: heavy }};",
|
||||
"[[a b, c]; [1 2 3] [4 5 [1 2 3]]] | table --collapse"
|
||||
]));
|
||||
assert_eq!(
|
||||
@ -82,7 +82,7 @@ fn table_collapse_heavy() {
|
||||
#[test]
|
||||
fn table_collapse_compact() {
|
||||
let actual = nu!(nu_repl_code(&[
|
||||
"let-env config = { table: { mode: compact }};",
|
||||
"$env.config = { table: { mode: compact }};",
|
||||
"[[a b, c]; [1 2 3] [4 5 [1 2 3]]] | table --collapse"
|
||||
]));
|
||||
assert_eq!(
|
||||
@ -104,7 +104,7 @@ fn table_collapse_compact() {
|
||||
#[test]
|
||||
fn table_collapse_compact_double() {
|
||||
let actual = nu!(nu_repl_code(&[
|
||||
"let-env config = { table: { mode: compact_double }};",
|
||||
"$env.config = { table: { mode: compact_double }};",
|
||||
"[[a b, c]; [1 2 3] [4 5 [1 2 3]]] | table --collapse"
|
||||
]));
|
||||
assert_eq!(
|
||||
@ -126,7 +126,7 @@ fn table_collapse_compact_double() {
|
||||
#[test]
|
||||
fn table_collapse_compact_light() {
|
||||
let actual = nu!(nu_repl_code(&[
|
||||
"let-env config = { table: { mode: light }};",
|
||||
"$env.config = { table: { mode: light }};",
|
||||
"[[a b, c]; [1 2 3] [4 5 [1 2 3]]] | table --collapse"
|
||||
]));
|
||||
assert_eq!(
|
||||
@ -148,7 +148,7 @@ fn table_collapse_compact_light() {
|
||||
#[test]
|
||||
fn table_collapse_none() {
|
||||
let actual = nu!(nu_repl_code(&[
|
||||
"let-env config = { table: { mode: none }};",
|
||||
"$env.config = { table: { mode: none }};",
|
||||
"[[a b, c]; [1 2 3] [4 5 [1 2 3]]] | table --collapse"
|
||||
]));
|
||||
assert_eq!(
|
||||
@ -166,7 +166,7 @@ fn table_collapse_none() {
|
||||
#[test]
|
||||
fn table_collapse_compact_reinforced() {
|
||||
let actual = nu!(nu_repl_code(&[
|
||||
"let-env config = { table: { mode: reinforced }};",
|
||||
"$env.config = { table: { mode: reinforced }};",
|
||||
"[[a b, c]; [1 2 3] [4 5 [1 2 3]]] | table --collapse"
|
||||
]));
|
||||
assert_eq!(
|
||||
@ -188,7 +188,7 @@ fn table_collapse_compact_reinforced() {
|
||||
#[test]
|
||||
fn table_collapse_compact_thin() {
|
||||
let actual = nu!(nu_repl_code(&[
|
||||
"let-env config = { table: { mode: thin }};",
|
||||
"$env.config = { table: { mode: thin }};",
|
||||
"[[a b, c]; [1 2 3] [4 5 [1 2 3]]] | table --collapse"
|
||||
]));
|
||||
assert_eq!(
|
||||
@ -210,7 +210,7 @@ fn table_collapse_compact_thin() {
|
||||
#[test]
|
||||
fn table_collapse_hearts() {
|
||||
let actual = nu!(nu_repl_code(&[
|
||||
"let-env config = { table: { mode: with_love }};",
|
||||
"$env.config = { table: { mode: with_love }};",
|
||||
"[[a b, c]; [1 2 3] [4 5 [1 2 3]]] | table --collapse"
|
||||
]));
|
||||
assert_eq!(
|
||||
|
@ -71,7 +71,7 @@ fn use_eval_export_env() {
|
||||
sandbox.with_files(vec![FileWithContentToBeTrimmed(
|
||||
"spam.nu",
|
||||
r#"
|
||||
export-env { let-env FOO = 'foo' }
|
||||
export-env { $env.FOO = 'foo' }
|
||||
"#,
|
||||
)]);
|
||||
|
||||
@ -93,7 +93,7 @@ fn use_eval_export_env_hide() {
|
||||
"#,
|
||||
)]);
|
||||
|
||||
let inp = &[r#"let-env FOO = 'foo'"#, r#"use spam.nu"#, r#"$env.FOO"#];
|
||||
let inp = &[r#"$env.FOO = 'foo'"#, r#"use spam.nu"#, r#"$env.FOO"#];
|
||||
|
||||
let actual = nu!(cwd: dirs.test(), pipeline(&inp.join("; ")));
|
||||
|
||||
@ -173,7 +173,7 @@ fn use_export_env_combined() {
|
||||
r#"
|
||||
def foo [] { 'foo' }
|
||||
alias bar = foo
|
||||
export-env { let-env FOO = (bar) }
|
||||
export-env { $env.FOO = (bar) }
|
||||
"#,
|
||||
)]);
|
||||
|
||||
@ -267,7 +267,7 @@ fn use_main_4() {
|
||||
#[test]
|
||||
fn use_main_def_env() {
|
||||
let inp = &[
|
||||
r#"module spam { export def-env main [] { let-env SPAM = "spam" } }"#,
|
||||
r#"module spam { export def-env main [] { $env.SPAM = "spam" } }"#,
|
||||
r#"use spam"#,
|
||||
r#"spam"#,
|
||||
r#"$env.SPAM"#,
|
||||
|
@ -70,7 +70,7 @@ fn with_env_hides_variables_in_parent_scope() {
|
||||
let actual = nu!(
|
||||
cwd: "tests/fixtures/formats",
|
||||
r#"
|
||||
let-env FOO = "1"
|
||||
$env.FOO = "1"
|
||||
print $env.FOO
|
||||
with-env [FOO null] {
|
||||
echo $env.FOO
|
||||
@ -87,7 +87,7 @@ fn with_env_shorthand_can_not_hide_variables() {
|
||||
let actual = nu!(
|
||||
cwd: "tests/fixtures/formats",
|
||||
r#"
|
||||
let-env FOO = "1"
|
||||
$env.FOO = "1"
|
||||
print $env.FOO
|
||||
FOO=null print $env.FOO
|
||||
print $env.FOO
|
||||
|
Reference in New Issue
Block a user