Skip to content

Commit 888ae72

Browse files
borsbors
committed
Auto merge of #8648 - Fogapod:rustc-args, r=ehuss
Add spaces after -C and -Z flags for consistency Most other options have a space after flag name. This commit makes verbose output of rustc invocations a little bit cleaner.
2 parents 1d66f90 + 8164c1d commit 888ae72

File tree

2 files changed

+38
-35
lines changed

2 files changed

+38
-35
lines changed

‎src/cargo/core/compiler/mod.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ fn rustc(cx: &mut Context<'_, '_>, unit: &Unit, exec: &Arc<dyn Executor>) -> Car
207207

208208
rustc.args(cx.bcx.rustflags_args(unit));
209209
if cx.bcx.config.cli_unstable().binary_dep_depinfo {
210-
rustc.arg("-Zbinary-dep-depinfo");
210+
rustc.arg("-Z").arg("binary-dep-depinfo");
211211
}
212212
let mut output_options = OutputOptions::new(cx, unit);
213213
let package_id = unit.pkg.package_id();
@@ -533,7 +533,7 @@ fn prepare_rustc(
533533
if cx.bcx.config.cli_unstable().jobserver_per_rustc {
534534
let client = cx.new_jobserver()?;
535535
base.inherit_jobserver(&client);
536-
base.arg("-Zjobserver-token-requests");
536+
base.arg("-Z").arg("jobserver-token-requests");
537537
assert!(cx.rustc_clients.insert(unit.clone(), client).is_none());
538538
} else {
539539
base.inherit_jobserver(&cx.jobserver);
@@ -809,10 +809,10 @@ fn build_base_args(
809809
}
810810
lto::Lto::ObjectAndBitcode => {} // this is rustc's default
811811
lto::Lto::OnlyBitcode => {
812-
cmd.arg("-Clinker-plugin-lto");
812+
cmd.arg("-C").arg("linker-plugin-lto");
813813
}
814814
lto::Lto::OnlyObject => {
815-
cmd.arg("-Cembed-bitcode=no");
815+
cmd.arg("-C").arg("embed-bitcode=no");
816816
}
817817
}
818818

@@ -862,7 +862,7 @@ fn build_base_args(
862862
// will simply not be needed when the behavior is stabilized in the Rust
863863
// compiler itself.
864864
if *panic == PanicStrategy::Abort {
865-
cmd.arg("-Zpanic-abort-tests");
865+
cmd.arg("-Z").arg("panic-abort-tests");
866866
}
867867
} else if test {
868868
cmd.arg("--cfg").arg("test");
@@ -922,7 +922,8 @@ fn build_base_args(
922922
// any non-public crate in the sysroot).
923923
//
924924
// RUSTC_BOOTSTRAP allows unstable features on stable.
925-
cmd.arg("-Zforce-unstable-if-unmarked")
925+
cmd.arg("-Z")
926+
.arg("force-unstable-if-unmarked")
926927
.env("RUSTC_BOOTSTRAP", "1");
927928
}
928929

‎tests/testsuite/lto.rs

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fn with_deps() {
2525
.file("src/main.rs", "extern crate bar; fn main() {}")
2626
.build();
2727
p.cargo("build -v --release")
28-
.with_stderr_contains("[..]`rustc[..]--crate-name bar[..]-Clinker-plugin-lto[..]`")
28+
.with_stderr_contains("[..]`rustc[..]--crate-name bar[..]-C linker-plugin-lto[..]`")
2929
.with_stderr_contains("[..]`rustc[..]--crate-name test[..]-C lto[..]`")
3030
.run();
3131
}
@@ -83,7 +83,7 @@ fn build_dep_not_ltod() {
8383
.file("src/main.rs", "fn main() {}")
8484
.build();
8585
p.cargo("build -v --release")
86-
.with_stderr_contains("[..]`rustc[..]--crate-name bar[..]-Cembed-bitcode=no[..]`")
86+
.with_stderr_contains("[..]`rustc[..]--crate-name bar[..]-C embed-bitcode=no[..]`")
8787
.with_stderr_contains("[..]`rustc[..]--crate-name test[..]-C lto[..]`")
8888
.run();
8989
}
@@ -188,30 +188,32 @@ fn complicated() {
188188
p.cargo("build -v --release")
189189
// normal deps and their transitive dependencies do not need object
190190
// code, so they should have linker-plugin-lto specified
191-
.with_stderr_contains("[..]`rustc[..]--crate-name dep_normal2 [..]-Clinker-plugin-lto[..]`")
192-
.with_stderr_contains("[..]`rustc[..]--crate-name dep_normal [..]-Clinker-plugin-lto[..]`")
191+
.with_stderr_contains(
192+
"[..]`rustc[..]--crate-name dep_normal2 [..]-C linker-plugin-lto[..]`",
193+
)
194+
.with_stderr_contains("[..]`rustc[..]--crate-name dep_normal [..]-C linker-plugin-lto[..]`")
193195
// build dependencies and their transitive deps don't need any bitcode,
194196
// so embedding should be turned off
195-
.with_stderr_contains("[..]`rustc[..]--crate-name dep_build2 [..]-Cembed-bitcode=no[..]`")
196-
.with_stderr_contains("[..]`rustc[..]--crate-name dep_build [..]-Cembed-bitcode=no[..]`")
197+
.with_stderr_contains("[..]`rustc[..]--crate-name dep_build2 [..]-C embed-bitcode=no[..]`")
198+
.with_stderr_contains("[..]`rustc[..]--crate-name dep_build [..]-C embed-bitcode=no[..]`")
197199
.with_stderr_contains(
198-
"[..]`rustc[..]--crate-name build_script_build [..]-Cembed-bitcode=no[..]`",
200+
"[..]`rustc[..]--crate-name build_script_build [..]-C embed-bitcode=no[..]`",
199201
)
200202
// proc macro deps are the same as build deps here
201203
.with_stderr_contains(
202-
"[..]`rustc[..]--crate-name dep_proc_macro2 [..]-Cembed-bitcode=no[..]`",
204+
"[..]`rustc[..]--crate-name dep_proc_macro2 [..]-C embed-bitcode=no[..]`",
203205
)
204206
.with_stderr_contains(
205-
"[..]`rustc[..]--crate-name dep_proc_macro [..]-Cembed-bitcode=no[..]`",
207+
"[..]`rustc[..]--crate-name dep_proc_macro [..]-C embed-bitcode=no[..]`",
206208
)
207209
.with_stderr_contains("[..]`rustc[..]--crate-name test [..]--crate-type bin[..]-C lto[..]`")
208210
.with_stderr_contains(
209211
"[..]`rustc[..]--crate-name test [..]--crate-type cdylib[..]-C lto[..]`",
210212
)
211213
.with_stderr_contains("[..]`rustc[..]--crate-name dep_shared [..]`")
212214
.with_stderr_does_not_contain("[..]--crate-name dep_shared[..]-C lto[..]")
213-
.with_stderr_does_not_contain("[..]--crate-name dep_shared[..]-Clinker-plugin-lto[..]")
214-
.with_stderr_does_not_contain("[..]--crate-name dep_shared[..]-Cembed-bitcode[..]")
215+
.with_stderr_does_not_contain("[..]--crate-name dep_shared[..]-C linker-plugin-lto[..]")
216+
.with_stderr_does_not_contain("[..]--crate-name dep_shared[..]-C embed-bitcode[..]")
215217
.run();
216218
}
217219

@@ -252,9 +254,9 @@ fn off_in_manifest_works() {
252254
[DOWNLOADING] [..]
253255
[DOWNLOADED] [..]
254256
[COMPILING] bar v0.0.1
255-
[RUNNING] `rustc --crate-name bar [..]--crate-type lib [..]-Cembed-bitcode=no[..]
257+
[RUNNING] `rustc --crate-name bar [..]--crate-type lib [..]-C embed-bitcode=no[..]
256258
[COMPILING] test [..]
257-
[RUNNING] `rustc --crate-name test [..]--crate-type lib [..]-Cembed-bitcode=no[..]
259+
[RUNNING] `rustc --crate-name test [..]--crate-type lib [..]-C embed-bitcode=no[..]
258260
[RUNNING] `rustc --crate-name test src/main.rs [..]--crate-type bin [..]-C lto=off[..]
259261
[FINISHED] [..]
260262
",
@@ -283,7 +285,7 @@ fn between_builds() {
283285
.with_stderr(
284286
"\
285287
[COMPILING] test [..]
286-
[RUNNING] `rustc [..]--crate-type lib[..]-Clinker-plugin-lto[..]
288+
[RUNNING] `rustc [..]--crate-type lib[..]-C linker-plugin-lto[..]
287289
[FINISHED] [..]
288290
",
289291
)
@@ -447,9 +449,9 @@ fn verify_lto(output: &Output, krate: &str, krate_info: &str, expected_lto: Lto)
447449
}
448450
} else if line.contains("-C lto") {
449451
Lto::Run(None)
450-
} else if line.contains("-Clinker-plugin-lto") {
452+
} else if line.contains("-C linker-plugin-lto") {
451453
Lto::OnlyBitcode
452-
} else if line.contains("-Cembed-bitcode=no") {
454+
} else if line.contains("-C embed-bitcode=no") {
453455
Lto::OnlyObject
454456
} else {
455457
Lto::ObjectAndBitcode
@@ -491,8 +493,8 @@ fn cdylib_and_rlib() {
491493
[FRESH] registry-shared v0.0.1
492494
[FRESH] bar v0.0.0 [..]
493495
[COMPILING] foo [..]
494-
[RUNNING] `rustc --crate-name foo [..]-Cembed-bitcode=no --test[..]
495-
[RUNNING] `rustc --crate-name a [..]-Cembed-bitcode=no --test[..]
496+
[RUNNING] `rustc --crate-name foo [..]-C embed-bitcode=no --test[..]
497+
[RUNNING] `rustc --crate-name a [..]-C embed-bitcode=no --test[..]
496498
[FINISHED] [..]
497499
[RUNNING] [..]
498500
[RUNNING] [..]
@@ -515,8 +517,8 @@ fn cdylib_and_rlib() {
515517
[FRESH] registry v0.0.1
516518
[FRESH] registry-shared v0.0.1
517519
[COMPILING] bar [..]
518-
[RUNNING] `rustc --crate-name bar [..]-Cembed-bitcode=no --test[..]
519-
[RUNNING] `rustc --crate-name b [..]-Cembed-bitcode=no --test[..]
520+
[RUNNING] `rustc --crate-name bar [..]-C embed-bitcode=no --test[..]
521+
[RUNNING] `rustc --crate-name b [..]-C embed-bitcode=no --test[..]
520522
[FINISHED] [..]
521523
[RUNNING] [..]
522524
[RUNNING] [..]
@@ -547,8 +549,8 @@ fn dylib() {
547549
[FRESH] registry-shared v0.0.1
548550
[FRESH] bar v0.0.0 [..]
549551
[COMPILING] foo [..]
550-
[RUNNING] `rustc --crate-name foo [..]-Cembed-bitcode=no --test[..]
551-
[RUNNING] `rustc --crate-name a [..]-Cembed-bitcode=no --test[..]
552+
[RUNNING] `rustc --crate-name foo [..]-C embed-bitcode=no --test[..]
553+
[RUNNING] `rustc --crate-name a [..]-C embed-bitcode=no --test[..]
552554
[FINISHED] [..]
553555
[RUNNING] [..]
554556
[RUNNING] [..]
@@ -560,9 +562,9 @@ fn dylib() {
560562
"\
561563
[COMPILING] registry-shared v0.0.1
562564
[FRESH] registry v0.0.1
563-
[RUNNING] `rustc --crate-name registry_shared [..]-Cembed-bitcode=no[..]
565+
[RUNNING] `rustc --crate-name registry_shared [..]-C embed-bitcode=no[..]
564566
[COMPILING] bar [..]
565-
[RUNNING] `rustc --crate-name bar [..]--crate-type dylib [..]-Cembed-bitcode=no[..]
567+
[RUNNING] `rustc --crate-name bar [..]--crate-type dylib [..]-C embed-bitcode=no[..]
566568
[FINISHED] [..]
567569
",
568570
)
@@ -573,8 +575,8 @@ fn dylib() {
573575
[FRESH] registry-shared v0.0.1
574576
[FRESH] registry v0.0.1
575577
[COMPILING] bar [..]
576-
[RUNNING] `rustc --crate-name bar [..]-Cembed-bitcode=no --test[..]
577-
[RUNNING] `rustc --crate-name b [..]-Cembed-bitcode=no --test[..]
578+
[RUNNING] `rustc --crate-name bar [..]-C embed-bitcode=no --test[..]
579+
[RUNNING] `rustc --crate-name b [..]-C embed-bitcode=no --test[..]
578580
[FINISHED] [..]
579581
[RUNNING] [..]
580582
[RUNNING] [..]
@@ -625,7 +627,7 @@ fn test_profile() {
625627
[COMPILING] bar v0.0.1
626628
[RUNNING] `rustc --crate-name bar [..]crate-type lib[..]
627629
[COMPILING] foo [..]
628-
[RUNNING] `rustc --crate-name foo [..]--crate-type lib --emit=dep-info,metadata,link -Cembed-bitcode=no[..]
630+
[RUNNING] `rustc --crate-name foo [..]--crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no[..]
629631
[RUNNING] `rustc --crate-name foo [..]--emit=dep-info,link -C lto=thin [..]--test[..]
630632
[FINISHED] [..]
631633
[RUNNING] [..]
@@ -678,8 +680,8 @@ fn dev_profile() {
678680
[COMPILING] bar v0.0.1
679681
[RUNNING] `rustc --crate-name bar [..]crate-type lib[..]
680682
[COMPILING] foo [..]
681-
[RUNNING] `rustc --crate-name foo [..]--crate-type lib --emit=dep-info,metadata,link -Clinker-plugin-lto [..]
682-
[RUNNING] `rustc --crate-name foo [..]--emit=dep-info,link -Cembed-bitcode=no [..]--test[..]
683+
[RUNNING] `rustc --crate-name foo [..]--crate-type lib --emit=dep-info,metadata,link -C linker-plugin-lto [..]
684+
[RUNNING] `rustc --crate-name foo [..]--emit=dep-info,link -C embed-bitcode=no [..]--test[..]
683685
[FINISHED] [..]
684686
[RUNNING] [..]
685687
[DOCTEST] foo

0 commit comments

Comments
 (0)