pub use to simplify usage

crates/nu-cli/src/repl.rs

@@ -858,8 +858,7 @@ fn do_auto_cd(
         report_shell_error(engine_state, &err);
         return;
     };
-    use nu_path::pwd_per_drive::pwd_per_drive_singleton::set_pwd_per_drive;
-    let _as_is = set_pwd_per_drive(PathBuf::from(path.clone()).as_path());
+    let _ = nu_path::set_pwd_per_drive(PathBuf::from(path.clone()).as_path());
     let cwd = Value::string(cwd, span);
 
     let shells = stack.get_env_var(engine_state, "NUSHELL_SHELLS");

crates/nu-command/src/filesystem/cd.rs

@@ -114,8 +114,7 @@ impl Command for Cd {
             //FIXME: this only changes the current scope, but instead this environment variable
             //should probably be a block that loads the information from the state in the overlay
             PermissionResult::PermissionOk => {
-                use nu_path::pwd_per_drive::pwd_per_drive_singleton::set_pwd_per_drive;
-                let _as_is = set_pwd_per_drive(path.as_path());
+                let _ = nu_path::set_pwd_per_drive(path.as_path());
                 stack.set_cwd(path)?;
                 Ok(PipelineData::empty())
             }

crates/nu-path/src/lib.rs

@@ -14,5 +14,6 @@ pub use components::components;
 pub use expansions::{canonicalize_with, expand_path_with, expand_to_real_path, locate_in_dirs};
 pub use helpers::{cache_dir, data_dir, home_dir, nu_config_dir};
 pub use path::*;
+pub use pwd_per_drive::pwd_per_drive_singleton::{set_pwd_per_drive, expand_pwd_per_drive};
 pub use tilde::expand_tilde;
 pub use trailing_slash::{has_trailing_slash, strip_trailing_slash};

crates/nu-path/src/pwd_per_drive.rs

@@ -235,7 +235,7 @@ mod tests {
 ///
 /// ```
 /// use std::path::{Path, PathBuf};
-/// use nu_path::pwd_per_drive::pwd_per_drive_singleton::*;
+/// use nu_path::{set_pwd_per_drive, expand_pwd_per_drive};
 ///
 /// //assert!(false); // Comment out to verify really tested
 /// if cfg!(windows) {
@@ -323,10 +323,10 @@ pub mod pwd_per_drive_singleton {
 
     #[test]
     fn test_usage_for_pwd_per_drive() {
-        if cfg!(windows) {
-            // Set PWD for drive C
-            set_pwd_per_drive(Path::new("C:\\Users\\Home")).unwrap();
+        // Set PWD for drive C
+        assert_eq!(Ok(()), set_pwd_per_drive(Path::new("C:\\Users\\Home")));
 
+        if cfg!(windows) {
             // Expand a relative path
             let expanded = expand_pwd_per_drive(Path::new("C:test"));
             assert_eq!(expanded, Some(PathBuf::from("C:\\Users\\Home\\test")));
@@ -342,6 +342,9 @@ pub mod pwd_per_drive_singleton {
             // Expand with no PWD set for the drive
             let expanded = expand_pwd_per_drive(Path::new("D:test"));
             assert_eq!(expanded, Some(PathBuf::from("D:\\test")));
+        } else {
+            // None always
+            assert_eq!(None, expand_pwd_per_drive(Path::new("C:test")));
         }
     }
 }

crates/nu-path/src/tilde.rs

@@ -21,8 +21,7 @@ fn expand_tilde_with_home(path: impl AsRef<Path>, home: Option<PathBuf>) -> Path
     let path = path.as_ref();
 
     if !path.starts_with("~") {
-        use crate::pwd_per_drive::pwd_per_drive_singleton::expand_pwd_per_drive;
-        if let Some(expanded_dir) = expand_pwd_per_drive(path) {
+        if let Some(expanded_dir) = crate::expand_pwd_per_drive(path) {
             return expanded_dir;
         }
         let string = path.to_string_lossy();