Alternative to 162fe72

dylint/src/lib.rs

@@ -450,6 +450,14 @@ fn check_or_fix(
             ])
             .args(args);
 
+        // smoelius:: See: https://github.com/rust-lang/rustup/pull/3703 and
+        // https://github.com/rust-lang/rustup/issues/3825
+        #[cfg(windows)]
+        {
+            let new_path = dylint_internal::prepend_toolchain_path(toolchain)?;
+            command.envs(vec![(crate::env::PATH, new_path)]);
+        }
+
         if let Some(stderr_path) = &opts.pipe_stderr {
             let file = OpenOptions::new()
                 .append(true)

internal/src/cargo.rs

@@ -148,12 +148,7 @@ impl Builder {
         {
             // smoelius: Work around: https://github.com/rust-lang/rustup/pull/2978
             let cargo_home = cargo_home().unwrap();
-            let old_path = crate::env::var(crate::env::PATH).unwrap();
-            let new_path = std::env::join_paths(
-                std::iter::once(Path::new(&cargo_home).join("bin"))
-                    .chain(std::env::split_paths(&old_path)),
-            )
-            .unwrap();
+            let new_path = crate::prepend_path(Path::new(&cargo_home).join("bin")).unwrap();
             command.envs(vec![(crate::env::PATH, new_path)]);
         }
         command.args([&self.subcommand]);

internal/src/command.rs

@@ -1,6 +1,7 @@
 use anyhow::{ensure, Context, Result};
 use std::{
-    path::Path,
+    ffi::{OsStr, OsString},
+    path::{Path, PathBuf},
     process::{Command, Output},
 };
 
@@ -61,18 +62,26 @@ pub fn driver(toolchain: &str, driver: &Path) -> Result<Command> {
     {
         // MinerSebas: To succesfully determine the dylint driver Version on Windows,
         // it is neccesary to add some Libraries to the Path.
-        let rustup_home = crate::env::var(crate::env::RUSTUP_HOME)?;
-        let old_path = crate::env::var(crate::env::PATH)?;
-        let new_path = std::env::join_paths(
-            std::iter::once(
-                Path::new(&rustup_home)
-                    .join("toolchains")
-                    .join(toolchain)
-                    .join("bin"),
-            )
-            .chain(std::env::split_paths(&old_path)),
-        )?;
+        let new_path = prepend_toolchain_path(toolchain)?;
         command.envs(vec![(crate::env::PATH, new_path)]);
     }
     Ok(command)
 }
+
+pub fn prepend_toolchain_path(toolchain: impl AsRef<Path>) -> Result<OsString> {
+    let rustup_home = crate::env::var(crate::env::RUSTUP_HOME)?;
+    prepend_path(
+        Path::new(&rustup_home)
+            .join("toolchains")
+            .join(toolchain)
+            .join("bin"),
+    )
+}
+
+pub fn prepend_path(path: impl AsRef<OsStr>) -> Result<OsString> {
+    let old_path = crate::env::var(crate::env::PATH)?;
+    let new_path = std::env::join_paths(
+        std::iter::once(PathBuf::from(path.as_ref())).chain(std::env::split_paths(&old_path)),
+    )?;
+    Ok(new_path)
+}