fixup windows

apollographql · Mar 4, 2021 · d137569 · d137569
1 parent bd895bc
commit d137569
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/installers/binstall/src/lib.rs b/installers/binstall/src/lib.rs
@@ -50,10 +50,10 @@ pub(crate) fn get_home_dir_path() -> Result<Utf8PathBuf, InstallerError> {
 
 #[cfg(test)]
 mod tests {
+    #[cfg(not(windows))]
+    use serial_test::serial;
     use super::Installer;
     use assert_fs::TempDir;
-    use serial_test::serial;
-
     use camino::Utf8PathBuf;
 
     #[cfg(not(windows))]

diff --git 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