From 58b5faf67fc522edf8521d02e1cc0721209c46fc Mon Sep 17 00:00:00 2001 From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com> Date: Sat, 14 Sep 2024 10:06:29 -0400 Subject: [PATCH] Move submodules to directory/mod.nu for ergonomics and extensibility --- crates/nu-std/src/lib.rs | 30 +++++++++---------- .../nu-std/std/{assert.nu => assert/mod.nu} | 0 crates/nu-std/std/{bench.nu => bench/mod.nu} | 0 crates/nu-std/std/{core.nu => core/mod.nu} | 2 +- crates/nu-std/std/{dirs.nu => dirs/mod.nu} | 0 crates/nu-std/std/{dt.nu => dt/mod.nu} | 0 .../nu-std/std/{formats.nu => formats/mod.nu} | 0 crates/nu-std/std/{help.nu => help/mod.nu} | 0 crates/nu-std/std/{input.nu => input/mod.nu} | 0 crates/nu-std/std/{iter.nu => iter/mod.nu} | 0 crates/nu-std/std/{log.nu => log/mod.nu} | 0 crates/nu-std/std/{math.nu => math/mod.nu} | 0 crates/nu-std/std/mod.nu | 30 +++++++++---------- crates/nu-std/std/{util.nu => util/mod.nu} | 0 crates/nu-std/std/{xml.nu => xml/mod.nu} | 0 15 files changed, 31 insertions(+), 31 deletions(-) rename crates/nu-std/std/{assert.nu => assert/mod.nu} (100%) rename crates/nu-std/std/{bench.nu => bench/mod.nu} (100%) rename crates/nu-std/std/{core.nu => core/mod.nu} (96%) rename crates/nu-std/std/{dirs.nu => dirs/mod.nu} (100%) rename crates/nu-std/std/{dt.nu => dt/mod.nu} (100%) rename crates/nu-std/std/{formats.nu => formats/mod.nu} (100%) rename crates/nu-std/std/{help.nu => help/mod.nu} (100%) rename crates/nu-std/std/{input.nu => input/mod.nu} (100%) rename crates/nu-std/std/{iter.nu => iter/mod.nu} (100%) rename crates/nu-std/std/{log.nu => log/mod.nu} (100%) rename crates/nu-std/std/{math.nu => math/mod.nu} (100%) rename crates/nu-std/std/{util.nu => util/mod.nu} (100%) rename crates/nu-std/std/{xml.nu => xml/mod.nu} (100%) diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs index 088cff7e55..4af23464a6 100644 --- a/crates/nu-std/src/lib.rs +++ b/crates/nu-std/src/lib.rs @@ -18,19 +18,19 @@ pub fn load_standard_library( let mut std_files = vec![ ("mod.nu", include_str!("../std/mod.nu")), - ("core.nu", include_str!("../std/core.nu")), - ("assert.nu", include_str!("../std/assert.nu")), - ("bench.nu", include_str!("../std/bench.nu")), - ("dirs.nu", include_str!("../std/dirs.nu")), - ("dt.nu", include_str!("../std/dt.nu")), - ("formats.nu", include_str!("../std/formats.nu")), - ("help.nu", include_str!("../std/help.nu")), - ("input.nu", include_str!("../std/input.nu")), - ("iter.nu", include_str!("../std/iter.nu")), - ("log.nu", include_str!("../std/log.nu")), - ("math.nu", include_str!("../std/math.nu")), - ("util.nu", include_str!("../std/util.nu")), - ("xml.nu", include_str!("../std/xml.nu")), + ("core", include_str!("../std/core/mod.nu")), + ("assert", include_str!("../std/assert/mod.nu")), + ("bench", include_str!("../std/bench/mod.nu")), + ("dirs", include_str!("../std/dirs/mod.nu")), + ("dt", include_str!("../std/dt/mod.nu")), + ("formats", include_str!("../std/formats/mod.nu")), + ("help", include_str!("../std/help/mod.nu")), + ("input", include_str!("../std/input/mod.nu")), + ("iter", include_str!("../std/iter/mod.nu")), + ("log", include_str!("../std/log/mod.nu")), + ("math", include_str!("../std/math/mod.nu")), + ("util", include_str!("../std/util/mod.nu")), + ("xml", include_str!("../std/xml/mod.nu")), ]; let mut working_set = StateWorkingSet::new(engine_state); @@ -51,14 +51,14 @@ pub fn load_standard_library( let std_dir = std_dir.to_string_lossy().to_string(); let source = r#" # Prelude -use ([ std core.nu ] | path join) * +use ([ std core ] | path join) * "#; let _ = working_set.add_virtual_path(std_dir, VirtualPath::Dir(std_virt_paths)); // 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("loading stdlib"); + let placeholder = PathBuf::from("load std/core"); working_set.files = FileStack::with_file(placeholder); let block = parse( diff --git a/crates/nu-std/std/assert.nu b/crates/nu-std/std/assert/mod.nu similarity index 100% rename from crates/nu-std/std/assert.nu rename to crates/nu-std/std/assert/mod.nu diff --git a/crates/nu-std/std/bench.nu b/crates/nu-std/std/bench/mod.nu similarity index 100% rename from crates/nu-std/std/bench.nu rename to crates/nu-std/std/bench/mod.nu diff --git a/crates/nu-std/std/core.nu b/crates/nu-std/std/core/mod.nu similarity index 96% rename from crates/nu-std/std/core.nu rename to crates/nu-std/std/core/mod.nu index cc07ce2458..1a777bcd0f 100644 --- a/crates/nu-std/std/core.nu +++ b/crates/nu-std/std/core/mod.nu @@ -1,4 +1,4 @@ -use dt.nu [datetime-diff, pretty-print-duration] +use dt [datetime-diff, pretty-print-duration] # Print a banner for nushell with information about the project export def banner [] { diff --git a/crates/nu-std/std/dirs.nu b/crates/nu-std/std/dirs/mod.nu similarity index 100% rename from crates/nu-std/std/dirs.nu rename to crates/nu-std/std/dirs/mod.nu diff --git a/crates/nu-std/std/dt.nu b/crates/nu-std/std/dt/mod.nu similarity index 100% rename from crates/nu-std/std/dt.nu rename to crates/nu-std/std/dt/mod.nu diff --git a/crates/nu-std/std/formats.nu b/crates/nu-std/std/formats/mod.nu similarity index 100% rename from crates/nu-std/std/formats.nu rename to crates/nu-std/std/formats/mod.nu diff --git a/crates/nu-std/std/help.nu b/crates/nu-std/std/help/mod.nu similarity index 100% rename from crates/nu-std/std/help.nu rename to crates/nu-std/std/help/mod.nu diff --git a/crates/nu-std/std/input.nu b/crates/nu-std/std/input/mod.nu similarity index 100% rename from crates/nu-std/std/input.nu rename to crates/nu-std/std/input/mod.nu diff --git a/crates/nu-std/std/iter.nu b/crates/nu-std/std/iter/mod.nu similarity index 100% rename from crates/nu-std/std/iter.nu rename to crates/nu-std/std/iter/mod.nu diff --git a/crates/nu-std/std/log.nu b/crates/nu-std/std/log/mod.nu similarity index 100% rename from crates/nu-std/std/log.nu rename to crates/nu-std/std/log/mod.nu diff --git a/crates/nu-std/std/math.nu b/crates/nu-std/std/math/mod.nu similarity index 100% rename from crates/nu-std/std/math.nu rename to crates/nu-std/std/math/mod.nu diff --git a/crates/nu-std/std/mod.nu b/crates/nu-std/std/mod.nu index ab42a17e4a..12487341bf 100644 --- a/crates/nu-std/std/mod.nu +++ b/crates/nu-std/std/mod.nu @@ -1,19 +1,19 @@ # std.nu, `used` to load all standard library components -export module core.nu -export module bench.nu -export module assert.nu -export module dirs.nu -export module dt.nu -export module formats.nu -export module help.nu -export module input.nu -export module iter.nu -export module log.nu -export module math.nu -export module util.nu -export module xml.nu +export module core +export module bench +export module assert +export module dirs +export module dt +export module formats +export module help +export module input +export module iter +export module log +export module math +export module util +export module xml export-env { - use dirs.nu [] - use log.nu [] + use dirs [] + use log [] } \ No newline at end of file diff --git a/crates/nu-std/std/util.nu b/crates/nu-std/std/util/mod.nu similarity index 100% rename from crates/nu-std/std/util.nu rename to crates/nu-std/std/util/mod.nu diff --git a/crates/nu-std/std/xml.nu b/crates/nu-std/std/xml/mod.nu similarity index 100% rename from crates/nu-std/std/xml.nu rename to crates/nu-std/std/xml/mod.nu