Rollup merge of #55495 - wesleywiser:opt_fuel_rustbuild, r=nikomatsakis

Don't print opt fuel messages to stdout because it breaks Rustbuild

Rustbuild passes `--message-format json` to the compiler invocations
which causes JSON to be emitted on stdout. Printing optimization fuel
messages to stdout breaks the json and causes Rustbuild to fail.

Work around this by emitting optimization fuel related messages on
stderr instead.

diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
index a17825a877d88cb45ecaba6e31d2cc6a15e0860a..fe94b62ef19e266c6e0989daba86a1992fd46d45 100644 (file)
--- a/src/librustc/session/mod.rs
+++ b/src/librustc/session/mod.rs
@@ -868,7 +868,7 @@ pub fn consider_optimizing<T: Fn() -> String>(&self, crate_name: &str, msg: T) -
                 let fuel = self.optimization_fuel_limit.get();
                 ret = fuel != 0;
                 if fuel == 0 && !self.out_of_fuel.get() {
-                    println!("optimization-fuel-exhausted: {}", msg());
+                    eprintln!("optimization-fuel-exhausted: {}", msg());
                     self.out_of_fuel.set(true);
                 } else if fuel > 0 {
                     self.optimization_fuel_limit.set(fuel - 1);

diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index e8fdaddaeb89cd5a3e654f196c3dd9007030707f..6c7982242bfada275219bc82d01eac49235190b6 100644 (file)
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -952,7 +952,7 @@ fn build_controller(self: Box<Self>,
             control.compilation_done.callback = box move |state| {
                 old_callback(state);
                 let sess = state.session;
-                println!("Fuel used by {}: {}",
+                eprintln!("Fuel used by {}: {}",
                     sess.print_fuel_crate.as_ref().unwrap(),
                     sess.print_fuel.get());
             }

diff --git a/src/test/run-pass/optimization-fuel-0.rs b/src/test/run-pass/optimization-fuel-0.rs
index 3832c040108f8f0b0ad35306357929331a479255..a12dad4489df92384837f0709350b449c40fc73e 100644 (file)
--- a/src/test/run-pass/optimization-fuel-0.rs
+++ b/src/test/run-pass/optimization-fuel-0.rs
@@ -12,7 +12,8 @@
 
 use std::mem::size_of;
 
-// compile-flags: -Z fuel=foo=0
+// (#55495: The --error-format is to sidestep an issue in our test harness)
+// compile-flags: --error-format human -Z fuel=foo=0
 
 struct S1(u8, u16, u8);
 struct S2(u8, u16, u8);

diff --git a/src/test/run-pass/optimization-fuel-0.stderr b/src/test/run-pass/optimization-fuel-0.stderr
new file mode 100644 (file)
index 0000000..3ad405b
--- /dev/null
+++ b/src/test/run-pass/optimization-fuel-0.stderr
@@ -0,0 +1 @@
+optimization-fuel-exhausted: Reorder fields of "S1"

diff --git a/src/test/run-pass/optimization-fuel-0.stdout b/src/test/run-pass/optimization-fuel-0.stdout
deleted file mode 100644 (file)
index 3ad405b..0000000
--- a/src/test/run-pass/optimization-fuel-0.stdout
+++ /dev/null
@@ -1 +0,0 @@
-optimization-fuel-exhausted: Reorder fields of "S1"

diff --git a/src/test/run-pass/optimization-fuel-1.rs b/src/test/run-pass/optimization-fuel-1.rs
index e3529ebfb0d811fa629df89c0a896aea5730495e..1e76aaa48b761065cfb20c24e0ef6a5bfb7ffeb2 100644 (file)
--- a/src/test/run-pass/optimization-fuel-1.rs
+++ b/src/test/run-pass/optimization-fuel-1.rs
@@ -12,7 +12,8 @@
 
 use std::mem::size_of;
 
-// compile-flags: -Z fuel=foo=1
+// (#55495: The --error-format is to sidestep an issue in our test harness)
+// compile-flags: --error-format human -Z fuel=foo=1
 
 struct S1(u8, u16, u8);
 struct S2(u8, u16, u8);

diff --git a/src/test/run-pass/optimization-fuel-1.stderr b/src/test/run-pass/optimization-fuel-1.stderr
new file mode 100644 (file)
index 0000000..197e452
--- /dev/null
+++ b/src/test/run-pass/optimization-fuel-1.stderr
@@ -0,0 +1 @@
+optimization-fuel-exhausted: Reorder fields of "S2"

diff --git a/src/test/run-pass/optimization-fuel-1.stdout b/src/test/run-pass/optimization-fuel-1.stdout
deleted file mode 100644 (file)
index 197e452..0000000
--- a/src/test/run-pass/optimization-fuel-1.stdout
+++ /dev/null
@@ -1 +0,0 @@
-optimization-fuel-exhausted: Reorder fields of "S2"

diff --git a/src/test/ui/print-fuel/print-fuel.rs b/src/test/ui/print-fuel/print-fuel.rs
index 96b025128ee9ac1be8086c3a50f1245a1881a6ab..31123410481c33d2f65809c92b57dc42c146dca2 100644 (file)
--- a/src/test/ui/print-fuel/print-fuel.rs
+++ b/src/test/ui/print-fuel/print-fuel.rs
@@ -11,7 +11,8 @@
 #![crate_name="foo"]
 #![allow(dead_code)]
 
-// compile-flags: -Z print-fuel=foo
+// (#55495: The --error-format is to sidestep an issue in our test harness)
+// compile-flags: --error-format human -Z print-fuel=foo
 // compile-pass
 
 struct S1(u8, u16, u8);

diff --git a/src/test/ui/print-fuel/print-fuel.stderr b/src/test/ui/print-fuel/print-fuel.stderr
new file mode 100644 (file)
index 0000000..cc88cc0
--- /dev/null
+++ b/src/test/ui/print-fuel/print-fuel.stderr
@@ -0,0 +1 @@
+Fuel used by foo: 3

diff --git a/src/test/ui/print-fuel/print-fuel.stdout b/src/test/ui/print-fuel/print-fuel.stdout
deleted file mode 100644 (file)
index cc88cc0..0000000
--- a/src/test/ui/print-fuel/print-fuel.stdout
+++ /dev/null
@@ -1 +0,0 @@
-Fuel used by foo: 3