diff --git a/Cargo.lock b/Cargo.lock index a77351905..fbd131a3f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2777,7 +2777,6 @@ dependencies = [ "indexmap", "miette", "nu-json", - "nu-path", "nu-test-support", "nu-utils", "num-format", diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml index 79473d818..cbdfca1c5 100644 --- a/crates/nu-protocol/Cargo.toml +++ b/crates/nu-protocol/Cargo.toml @@ -12,8 +12,6 @@ version = "0.72.2" [dependencies] nu-utils = { path = "../nu-utils", version = "0.72.2" } nu-json = { path = "../nu-json", version = "0.72.2" } -nu-path = { path = "../nu-path", version = "0.72.2" } # Used for test support -nu-test-support = { path = "../nu-test-support", version = "0.72.2" } byte-unit = "4.0.9" chrono = { version="0.4.23", features= ["serde", "std"], default-features = false } @@ -35,3 +33,4 @@ plugin = ["serde_json"] [dev-dependencies] serde_json = "1.0" +nu-test-support = { path = "../nu-test-support", version = "0.72.2" } diff --git a/crates/nu-test-support/src/lib.rs b/crates/nu-test-support/src/lib.rs index 2dfd12824..5f95efbab 100644 --- a/crates/nu-test-support/src/lib.rs +++ b/crates/nu-test-support/src/lib.rs @@ -3,6 +3,8 @@ pub mod fs; pub mod locale_override; pub mod macros; pub mod playground; +// Needs to be reexported for `nu!` macro +pub use nu_path; pub struct Outcome { pub out: String, diff --git a/crates/nu-test-support/src/macros.rs b/crates/nu-test-support/src/macros.rs index 593202c99..9ccf0fb05 100644 --- a/crates/nu-test-support/src/macros.rs +++ b/crates/nu-test-support/src/macros.rs @@ -138,7 +138,7 @@ macro_rules! nu { let test_bins = $crate::fs::binaries(); let cwd = std::env::current_dir().expect("Could not get current working directory."); - let test_bins = nu_path::canonicalize_with(&test_bins, cwd).unwrap_or_else(|e| { + let test_bins = $crate::nu_path::canonicalize_with(&test_bins, cwd).unwrap_or_else(|e| { panic!( "Couldn't canonicalize dummy binaries path {}: {:?}", test_bins.display(),