fix(new): Add to workspace relative to manifest, not current-dir

epage · epage · commit f8467c641c99 · 2024-09-06T09:45:19.000-05:00
We were correctly doing this for cases like `cargo new foo` or `cargo new deeper/than/this/directory/foo` but not `cargo new ../foo`. This came up when discussing #14501
diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs
@@ -802,7 +802,7 @@ fn mk(gctx: &GlobalContext, opts: &MkOptions<'_>) -> CargoResult<()> {
         }
     }
 
-    let manifest_path = path.join("Cargo.toml");
+    let manifest_path = paths::normalize_path(&path.join("Cargo.toml"));
     if let Ok(root_manifest_path) = find_root_manifest_for_wd(&manifest_path) {
         let root_manifest = paths::read(&root_manifest_path)?;
         // Sometimes the root manifest is not a valid manifest, so we only try to parse it if it is.
diff --git a/tests/testsuite/cargo_new/ignore_current_dir_workspace/out/workspace/Cargo.toml b/tests/testsuite/cargo_new/ignore_current_dir_workspace/out/workspace/Cargo.toml
@@ -1,5 +1,4 @@
 [workspace]
-members = ["../out-of-workspace"]
 
 [package]
 name = "foo"
diff --git a/tests/testsuite/cargo_new/ignore_current_dir_workspace/stderr.term.svg b/tests/testsuite/cargo_new/ignore_current_dir_workspace/stderr.term.svg
@@ -1,10 +1,9 @@
-<svg width="1902px" height="146px" xmlns="http://www.w3.org/2000/svg">
+<svg width="970px" height="74px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
     .bg { background: #000000 }
     .fg-cyan { fill: #00AAAA }
     .fg-green { fill: #00AA00 }
-    .fg-yellow { fill: #AA5500 }
     .container {
       padding: 0 10px;
       line-height: 18px;
@@ -22,17 +21,9 @@
   <text xml:space="preserve" class="container fg">
     <tspan x="10px" y="28px"><tspan class="fg-green bold">    Creating</tspan><tspan> library `out-of-workspace` package</tspan>
 </tspan>
-    <tspan x="10px" y="46px"><tspan class="fg-green bold">      Adding</tspan><tspan> `out-of-workspace` as member of workspace at `[ROOT]/case/workspace`</tspan>
+    <tspan x="10px" y="46px"><tspan class="fg-cyan bold">note</tspan><tspan class="bold">:</tspan><tspan> see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html</tspan>
 </tspan>
-    <tspan x="10px" y="64px"><tspan class="fg-yellow bold">warning</tspan><tspan class="bold">:</tspan><tspan> compiling this new package may not work due to invalid workspace configuration</tspan>
-</tspan>
-    <tspan x="10px" y="82px">
-</tspan>
-    <tspan x="10px" y="100px"><tspan>workspace member `[ROOT]/case/out-of-workspace/Cargo.toml` is not hierarchically below the workspace root `[ROOT]/case/workspace/Cargo.toml`</tspan>
-</tspan>
-    <tspan x="10px" y="118px"><tspan class="fg-cyan bold">note</tspan><tspan class="bold">:</tspan><tspan> see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html</tspan>
-</tspan>
-    <tspan x="10px" y="136px">
+    <tspan x="10px" y="64px">
 </tspan>
   </text>
 

Original file line number	Diff line number	Diff line change
`@@ -802,7 +802,7 @@ fn mk(gctx: &GlobalContext, opts: &MkOptions<'_>) -> CargoResult<()> {`
`802`	`802`	`}`
`803`	`803`	`}`
`804`	`804`
`805`		`- let manifest_path = path.join("Cargo.toml");`
	`805`	`+ let manifest_path = paths::normalize_path(&path.join("Cargo.toml"));`
`806`	`806`	`if let Ok(root_manifest_path) = find_root_manifest_for_wd(&manifest_path) {`
`807`	`807`	`let root_manifest = paths::read(&root_manifest_path)?;`
`808`	`808`	`// Sometimes the root manifest is not a valid manifest, so we only try to parse it if it is.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`[workspace]`
`2`		`-members = ["../out-of-workspace"]`
`3`	`2`
`4`	`3`	`[package]`
`5`	`4`	`name = "foo"`