Auto merge of #10668 - weihanglo:issue-10652, r=ehuss

Normalize path for `cargo vendor` output
rust-lang · Jul 16, 2022 · 576356f · 576356f
2 parents bd5db30 + 88e8892
commit 576356f
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 3 deletions.
diff --git a/src/cargo/ops/vendor.rs b/src/cargo/ops/vendor.rs
@@ -60,7 +60,7 @@ struct VendorConfig {
 #[serde(rename_all = "lowercase", untagged)]
 enum VendorSource {
     Directory {
-        directory: PathBuf,
+        directory: String,
     },
     Registry {
         registry: Option<String>,
@@ -298,7 +298,10 @@ fn sync(
         config.insert(
             merged_source_name.to_string(),
             VendorSource::Directory {
-                directory: opts.destination.to_path_buf(),
+                // Windows-flavour paths are valid here on Windows but Unix.
+                // This backslash normalization is for making output paths more
+                // cross-platform compatible.
+                directory: opts.destination.to_string_lossy().replace("\\", "/"),
             },
         );
     } else if !dest_dir_already_exists {

diff --git a/tests/testsuite/vendor.rs b/tests/testsuite/vendor.rs
@@ -69,6 +69,53 @@ directory = "vendor"
         .run();
 }
 
+#[cargo_test]
+fn vendor_path_specified() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+                [package]
+                name = "foo"
+                version = "0.1.0"
+
+                [dependencies]
+                log = "0.3.5"
+            "#,
+        )
+        .file("src/lib.rs", "")
+        .build();
+
+    Package::new("log", "0.3.5").publish();
+
+    let path = if cfg!(windows) {
+        r#"deps\.vendor"#
+    } else {
+        "deps/.vendor"
+    };
+
+    let output = p
+        .cargo("vendor --respect-source-config")
+        .arg(path)
+        .exec_with_output()
+        .unwrap();
+    // Assert against original output to ensure that
+    // path is normalized by `ops::vendor` on Windows.
+    assert_eq!(
+        &String::from_utf8(output.stdout).unwrap(),
+        r#"
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "deps/.vendor"
+"#
+    );
+
+    let lock = p.read_file("deps/.vendor/log/Cargo.toml");
+    assert!(lock.contains("version = \"0.3.5\""));
+}
+
 fn add_vendor_config(p: &Project) {
     p.change_file(
         ".cargo/config",
@@ -117,7 +164,7 @@ fn package_exclude() {
         .publish();
 
     p.cargo("vendor --respect-source-config").run();
-    let csum = dbg!(p.read_file("vendor/bar/.cargo-checksum.json"));
+    let csum = p.read_file("vendor/bar/.cargo-checksum.json");
     assert!(csum.contains(".include"));
     assert!(!csum.contains(".exclude"));
     assert!(!csum.contains(".dotdir/exclude"));