fix(dist/prefix): normalize path separators in REL_MANIFEST_DIR

Author: rami3l

src/dist/prefix.rs

@@ -2,7 +2,14 @@ use std::path::{Path, PathBuf};
 
 use crate::utils;
 
-const REL_MANIFEST_DIR: &str = "lib/rustlib";
+/// The relative path to the manifest directory in a Rust installation,
+/// with path components separated by [`std::path::MAIN_SEPARATOR`].
+const REL_MANIFEST_DIR: &str = match std::path::MAIN_SEPARATOR {
+    '/' => "lib/rustlib",
+    '\\' => r"lib\rustlib",
+    _ => panic!("unknown `std::path::MAIN_SEPARATOR`"),
+};
+
 static V1_COMMON_COMPONENT_LIST: &[&str] = &["cargo", "rustc", "rust-docs"];
 
 #[derive(Clone, Debug)]

tests/suite/cli_v2.rs

@@ -3,6 +3,7 @@
 
 use std::fs;
 use std::io::Write;
+use std::path::PathBuf;
 
 use rustup::dist::TargetTriple;
 use rustup::for_host;
@@ -392,17 +393,15 @@ async fn bad_manifest() {
     // install some toolchain
     cx.config.expect_ok(&["rustup", "update", "nightly"]).await;
 
-    #[cfg(not(target_os = "windows"))]
-    let path = format!(
-        "toolchains/nightly-{}/lib/rustlib/multirust-channel-manifest.toml",
-        this_host_triple(),
-    );
-
-    #[cfg(target_os = "windows")]
-    let path = format!(
-        r"toolchains\nightly-{}\lib/rustlib\multirust-channel-manifest.toml",
-        this_host_triple(),
-    );
+    let path = [
+        "toolchains",
+        for_host!("nightly-{}"),
+        "lib",
+        "rustlib",
+        "multirust-channel-manifest.toml",
+    ]
+    .into_iter()
+    .collect::<PathBuf>();
 
     assert!(cx.config.rustupdir.has(&path));
     let path = cx.config.rustupdir.join(&path);