diff --git a/installers/binstall/src/lib.rs b/installers/binstall/src/lib.rs index 05534ea731..4b961772f7 100644 --- a/installers/binstall/src/lib.rs +++ b/installers/binstall/src/lib.rs @@ -50,16 +50,15 @@ pub(crate) fn get_home_dir_path() -> Result { #[cfg(test)] mod tests { - use super::Installer; - use assert_fs::TempDir; - use serial_test::serial; - - use camino::Utf8PathBuf; - #[cfg(not(windows))] #[test] #[serial] fn install_bins_creates_rover_home() { + use super::Installer; + use assert_fs::TempDir; + use serial_test::serial; + + use camino::Utf8PathBuf; let fixture = TempDir::new().unwrap(); let base_dir = Utf8PathBuf::from_path_buf(fixture.path().to_path_buf()).unwrap(); let install_path = Installer { diff --git a/installers/binstall/src/system/windows.rs b/installers/binstall/src/system/windows.rs index dcf60ce0cd..bdb41c0a6f 100644 --- a/installers/binstall/src/system/windows.rs +++ b/installers/binstall/src/system/windows.rs @@ -7,11 +7,7 @@ use std::io; /// Adds the downloaded binary in Installer to a Windows PATH pub fn add_binary_to_path(installer: &Installer) -> Result<(), InstallerError> { let windows_path = get_windows_path_var()?; - let bin_path = installer - .get_bin_dir_path()? - .to_str() - .ok_or(InstallerError::PathNotUnicode)? - .to_string(); + let bin_path = installer.get_bin_dir_path()?.to_string(); if let Some(old_path) = windows_path { if let Some(new_path) = add_to_path(&old_path, &bin_path) { apply_new_path(&new_path)?; diff --git a/installers/npm/package-lock.json b/installers/npm/package-lock.json index 77dba7f775..5cff5039f7 100644 --- a/installers/npm/package-lock.json +++ b/installers/npm/package-lock.json @@ -101,9 +101,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz", "integrity": "sha1-hvmrTBAvA3G3KXuSplHVgkvIy3M=", - "dependencies": { - "wcwidth": ">=1.0.1" - }, "optionalDependencies": { "wcwidth": ">=1.0.1" }