refactor: reuse Package::root() instead

weihanglo · weihanglo · commit 75712e1e3015 · 2024-03-20T14:18:05.000-04:00
diff --git a/src/cargo/ops/vendor.rs b/src/cargo/ops/vendor.rs
@@ -133,7 +133,7 @@ fn sync(
                 continue;
             }
             if let Ok(pkg) = packages.get_one(pkg) {
-                drop(fs::remove_dir_all(pkg.manifest_path().parent().unwrap()));
+                drop(fs::remove_dir_all(pkg.root()));
             }
         }
     }
@@ -192,10 +192,7 @@ fn sync(
     let mut tmp_buf = [0; 64 * 1024];
     for (id, pkg) in ids.iter() {
         // Next up, copy it to the vendor directory
-        let src = pkg
-            .manifest_path()
-            .parent()
-            .expect("manifest_path should point to a file");
+        let src = pkg.root();
         let max_version = *versions[&id.name()].iter().rev().next().unwrap().0;
         let dir_has_version_suffix = opts.versioned_dirs || id.version() != max_version;
         let dst_name = if dir_has_version_suffix {

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ fn sync(`
`133`	`133`	`continue;`
`134`	`134`	`}`
`135`	`135`	`if let Ok(pkg) = packages.get_one(pkg) {`
`136`		`- drop(fs::remove_dir_all(pkg.manifest_path().parent().unwrap()));`
	`136`	`+ drop(fs::remove_dir_all(pkg.root()));`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`	`}`
`@@ -192,10 +192,7 @@ fn sync(`
`192`	`192`	`let mut tmp_buf = [0; 64 * 1024];`
`193`	`193`	`for (id, pkg) in ids.iter() {`
`194`	`194`	`// Next up, copy it to the vendor directory`
`195`		`- let src = pkg`
`196`		`- .manifest_path()`
`197`		`- .parent()`
`198`		`- .expect("manifest_path should point to a file");`
	`195`	`+ let src = pkg.root();`
`199`	`196`	`let max_version = *versions[&id.name()].iter().rev().next().unwrap().0;`
`200`	`197`	`let dir_has_version_suffix = opts.versioned_dirs \|\| id.version() != max_version;`
`201`	`198`	`let dst_name = if dir_has_version_suffix {`