Auto merge of #64333 - Centril:rollup-llhhr82, r=Centril

Rollup of 4 pull requests Successful merges: - #64307 (Update clippy) - #64308 (Update miri submodule) - #64318 (update reference) - #64323 (Always show backtrace on Fuchsia) Failed merges: r? @ghost
rust-lang · Sep 10, 2019 · 61dced1 · 61dced1
2 parents 122fefc + 59156af
commit 61dced1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/src/doc/reference b/src/doc/reference
diff --git a/src/libstd/sys_common/backtrace.rs b/src/libstd/sys_common/backtrace.rs
@@ -117,6 +117,12 @@ where
 // For now logging is turned off by default, and this function checks to see
 // whether the magical environment variable is present to see if it's turned on.
 pub fn log_enabled() -> Option<PrintFmt> {
+    // Setting environment variables for Fuchsia components isn't a standard
+    // or easily supported workflow. For now, always display backtraces.
+    if cfg!(target_os = "fuchsia") {
+        return Some(PrintFmt::Full);
+    }
+
     static ENABLED: atomic::AtomicIsize = atomic::AtomicIsize::new(0);
     match ENABLED.load(Ordering::SeqCst) {
         0 => {}

diff --git a/src/tools/clippy b/src/tools/clippy
diff --git a/src/tools/miri b/src/tools/miri
+1 −1		rust-version
+1 −1		tests/compile-fail/stack_free.rs
+1 −1		tests/compiletest.rs