itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(trim-paths): merge trim-paths from different profiles

Browse Source 
In 4d29af1 we forgot to add trim-paths to `fn merge()`.
This commit follows how `-Zprofile-rustflags` works ---
overriding instead of merging array.
This commit is contained in:
Weihang Lo 2023-11-01 22:53:27 -04:00
parent 618701921d
commit 7535971d8b
No known key found for this signature in database
GPG Key ID: D7DBF189825E82E7
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cargo/util/toml/mod.rs
View File

@ -3007,6 +3007,10 @@ impl TomlProfile {
if let Some(v) = &profile.strip { if let Some(v) = &profile.strip {
self.strip = Some(v.clone()); self.strip = Some(v.clone());
} }
if let Some(v) = &profile.trim_paths {
self.trim_paths = Some(v.clone())
}
} }
} }

2
tests/testsuite/profile_trim_paths.rs
View File

@ -192,7 +192,7 @@ fn profile_merge_works() {
"\ "\
[COMPILING] foo v0.0.1 ([CWD]) [COMPILING] foo v0.0.1 ([CWD])
[RUNNING] `rustc [..]\ [RUNNING] `rustc [..]\
-Zremap-path-scope=macro \ -Zremap-path-scope=diagnostics \
--remap-path-prefix=[..]/lib/rustlib/src/rust=/rustc/[..] \ --remap-path-prefix=[..]/lib/rustlib/src/rust=/rustc/[..] \
--remap-path-prefix=[CWD]= [..] --remap-path-prefix=[CWD]= [..]
[FINISHED] custom [..]", [FINISHED] custom [..]",