Merge pull request #941 from messense/dunce

Replace `adjust_canonicalization` with the `dunce` crate

Cargo.toml

@@ -68,6 +68,7 @@ rpassword = { version = "6.0.1", optional = true }
 ureq = { version = "2.3.1", features = ["gzip", "socks-proxy"], default-features = false, optional = true }
 native-tls-crate = { package = "native-tls", version = "0.2.8", optional = true }
 tracing = "0.1.34"
+dunce = "1.0.2"
 
 [dev-dependencies]
 indoc = "1.0.3"

src/develop.rs

@@ -79,10 +79,10 @@ pub fn develop(
             "--disable-pip-version-check",
             "install",
             "--force-reinstall",
-            &adjust_canonicalization(filename),
         ];
         let output = Command::new(&python)
             .args(&command)
+            .arg(dunce::simplified(filename))
             .output()
             .context(format!("pip install failed with {:?}", python))?;
         if !output.status.success() {
@@ -110,22 +110,3 @@ pub fn develop(
 
     Ok(())
 }
-
-// Y U NO accept windows path prefix, pip?
-// Anyways, here's shepmasters stack overflow solution
-// https://stackoverflow.com/a/50323079/3549270
-#[cfg(target_family = "unix")]
-fn adjust_canonicalization(p: impl AsRef<Path>) -> String {
-    p.as_ref().display().to_string()
-}
-
-#[cfg(target_os = "windows")]
-fn adjust_canonicalization(p: impl AsRef<Path>) -> String {
-    const VERBATIM_PREFIX: &str = r#"\\?\"#;
-    let p = p.as_ref().display().to_string();
-    if p.starts_with(VERBATIM_PREFIX) {
-        p[VERBATIM_PREFIX.len()..].to_string()
-    } else {
-        p
-    }
-}

tests/common/editable.rs

@@ -1,6 +1,4 @@
-use crate::common::{
-    adjust_canonicalization, check_installed, create_virtualenv, maybe_mock_cargo,
-};
+use crate::common::{check_installed, create_virtualenv, maybe_mock_cargo};
 use anyhow::{bail, Context, Result};
 use clap::Parser;
 use maturin::BuildOptions;
@@ -59,10 +57,10 @@ pub fn test_editable(
             "--no-cache-dir",
             "install",
             "--force-reinstall",
-            &adjust_canonicalization(filename),
         ];
         let output = Command::new(&python)
             .args(&command)
+            .arg(dunce::simplified(filename))
             .output()
             .context(format!("pip install failed with {:?}", python))?;
         if !output.status.success() {

tests/common/integration.rs

@@ -1,6 +1,4 @@
-use crate::common::{
-    adjust_canonicalization, check_installed, create_virtualenv, maybe_mock_cargo,
-};
+use crate::common::{check_installed, create_virtualenv, maybe_mock_cargo};
 use anyhow::{bail, Context, Result};
 use cargo_zigbuild::Zig;
 use clap::Parser;
@@ -99,10 +97,10 @@ pub fn test_integration(
             "--no-cache-dir",
             "install",
             "--force-reinstall",
-            &adjust_canonicalization(filename),
         ];
         let output = Command::new(&python)
             .args(&command)
+            .arg(dunce::simplified(filename))
             .output()
             .context(format!("pip install failed with {:?}", python))?;
         if !output.status.success() {
@@ -210,8 +208,8 @@ pub fn test_integration_conda(package: impl AsRef<Path>, bindings: Option<String
                 "--disable-pip-version-check",
                 "install",
                 "--force-reinstall",
-                &adjust_canonicalization(wheel_file),
             ])
+            .arg(dunce::simplified(&wheel_file))
             .stderr(Stdio::inherit())
             .output()?;
         if !output.status.success() {

tests/common/mod.rs

@@ -12,25 +12,6 @@ pub mod errors;
 pub mod integration;
 pub mod other;
 
-// Y U NO accept windows path prefix, pip?
-// Anyways, here's shepmasters stack overflow solution
-// https://stackoverflow.com/a/50323079/3549270
-#[cfg(target_family = "unix")]
-pub fn adjust_canonicalization(p: impl AsRef<Path>) -> String {
-    p.as_ref().display().to_string()
-}
-
-#[cfg(target_os = "windows")]
-pub fn adjust_canonicalization(p: impl AsRef<Path>) -> String {
-    const VERBATIM_PREFIX: &str = r#"\\?\"#;
-    let p = p.as_ref().display().to_string();
-    if p.starts_with(VERBATIM_PREFIX) {
-        p[VERBATIM_PREFIX.len()..].to_string()
-    } else {
-        p
-    }
-}
-
 /// Check that the package is either not installed or works correctly
 pub fn check_installed(package: &Path, python: &Path) -> Result<()> {
     let check_installed = Path::new(package)
@@ -125,7 +106,7 @@ pub fn create_virtualenv(
         cmd.arg("-p").arg(interp);
     }
     let output = cmd
-        .arg(adjust_canonicalization(&venv_dir))
+        .arg(dunce::simplified(&venv_dir))
         .stderr(Stdio::inherit())
         .output()
         .expect("Failed to create a virtualenv");