From cce12efe48cd5d6850536372aa7b9571786b5a17 Mon Sep 17 00:00:00 2001 From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com> Date: Wed, 29 Jan 2025 11:16:12 -0500 Subject: [PATCH] Rename `std/core` to `std/prelude` (#14962) `std/core` is always loaded by Nushell during startup, and the commands in it are always available. As such, it's renamed `std/prelude`. `scope modules` and `view files` now show `prelude` in place of `core`. --- crates/nu-std/src/lib.rs | 10 +++++++--- crates/nu-std/std/{core => prelude}/mod.nu | 0 crates/nu-std/tests/test_core.nu | 7 ------- crates/nu-std/tests/test_prelude.nu | 7 +++++++ 4 files changed, 14 insertions(+), 10 deletions(-) rename crates/nu-std/std/{core => prelude}/mod.nu (100%) delete mode 100644 crates/nu-std/tests/test_core.nu create mode 100644 crates/nu-std/tests/test_prelude.nu diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs index b03b710cfc..58b1c98ff8 100644 --- a/crates/nu-std/src/lib.rs +++ b/crates/nu-std/src/lib.rs @@ -36,7 +36,11 @@ pub fn load_standard_library( // Submodules/subdirectories ... std//mod.nu let mut std_submodules = vec![ // Loaded at startup - Not technically part of std - ("mod.nu", "std/core", include_str!("../std/core/mod.nu")), + ( + "mod.nu", + "std/prelude", + include_str!("../std/prelude/mod.nu"), + ), // std submodules ("mod.nu", "std/assert", include_str!("../std/assert/mod.nu")), ("mod.nu", "std/bench", include_str!("../std/bench/mod.nu")), @@ -81,12 +85,12 @@ pub fn load_standard_library( let (block, delta) = { let source = r#" # Prelude -use std/core * +use std/prelude * "#; // Add a placeholder file to the stack of files being evaluated. // The name of this file doesn't matter; it's only there to set the current working directory to NU_STDLIB_VIRTUAL_DIR. - let placeholder = PathBuf::from("load std/core"); + let placeholder = PathBuf::from("load std/prelude"); working_set.files = FileStack::with_file(placeholder); let block = parse( diff --git a/crates/nu-std/std/core/mod.nu b/crates/nu-std/std/prelude/mod.nu similarity index 100% rename from crates/nu-std/std/core/mod.nu rename to crates/nu-std/std/prelude/mod.nu diff --git a/crates/nu-std/tests/test_core.nu b/crates/nu-std/tests/test_core.nu deleted file mode 100644 index 654a1bcedf..0000000000 --- a/crates/nu-std/tests/test_core.nu +++ /dev/null @@ -1,7 +0,0 @@ -use std/assert - -#[test] -def banner [] { - use std/core - assert ((core banner | lines | length) == 16) -} diff --git a/crates/nu-std/tests/test_prelude.nu b/crates/nu-std/tests/test_prelude.nu new file mode 100644 index 0000000000..b163ddd15f --- /dev/null +++ b/crates/nu-std/tests/test_prelude.nu @@ -0,0 +1,7 @@ +use std/assert + +#[test] +def banner [] { + use std/prelude + assert ((prelude banner | lines | length) == 16) +}