Auto merge of #12908 - weihanglo:profile-merge-trim-paths, r=epage

fix: merge `trim-paths` from different profiles
rust-lang · Nov 2, 2023 · 6354bb3 · 6354bb3
2 parents 5613aac + 7535971
commit 6354bb3
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 0 deletions.
diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs
@@ -3007,6 +3007,10 @@ impl TomlProfile {
         if let Some(v) = &profile.strip {
             self.strip = Some(v.clone());
         }
+
+        if let Some(v) = &profile.trim_paths {
+            self.trim_paths = Some(v.clone())
+        }
     }
 }
 

diff --git a/tests/testsuite/profile_trim_paths.rs b/tests/testsuite/profile_trim_paths.rs
@@ -165,6 +165,41 @@ fn multiple_options() {
         .run();
 }
 
+#[cargo_test(nightly, reason = "-Zremap-path-scope is unstable")]
+fn profile_merge_works() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+                [package]
+                name = "foo"
+                version = "0.0.1"
+
+                [profile.dev]
+                trim-paths = ["macro"]
+
+                [profile.custom]
+                inherits = "dev"
+                trim-paths = ["diagnostics"]
+            "#,
+        )
+        .file("src/lib.rs", "")
+        .build();
+
+    p.cargo("build -v -Ztrim-paths --profile custom")
+        .masquerade_as_nightly_cargo(&["-Ztrim-paths"])
+        .with_stderr(
+            "\
+[COMPILING] foo v0.0.1 ([CWD])
+[RUNNING] `rustc [..]\
+    -Zremap-path-scope=diagnostics \
+    --remap-path-prefix=[..]/lib/rustlib/src/rust=/rustc/[..] \
+    --remap-path-prefix=[CWD]= [..]
+[FINISHED] custom [..]",
+        )
+        .run();
+}
+
 #[cargo_test(nightly, reason = "-Zremap-path-scope is unstable")]
 fn registry_dependency() {
     Package::new("bar", "0.0.1")