about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-09-10 04:30:32 +0000
committerbors <bors@rust-lang.org>2019-09-10 04:30:32 +0000
commit61dced18277a8cd55c963502db5a4cdf837858f3 (patch)
tree6fedbb2a022b44149e143f142980048cfb2578bb /src
parent122fefc63e4c2bab7f76bb24a7ab056b7bc7b37e (diff)
parent59156af1e7e64172ecfd80b96fa2680cc0225462 (diff)
downloadrust-61dced18277a8cd55c963502db5a4cdf837858f3.tar.gz
rust-61dced18277a8cd55c963502db5a4cdf837858f3.zip
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
Diffstat (limited to 'src')
m---------src/doc/reference0
-rw-r--r--src/libstd/sys_common/backtrace.rs6
m---------src/tools/clippy16
m---------src/tools/miri13
4 files changed, 22 insertions, 13 deletions
diff --git a/src/doc/reference b/src/doc/reference
-Subproject 090c015f7939665866432c334957bd536c81187
+Subproject 1944efed35989ba57fa397c0724c4921310311f
diff --git a/src/libstd/sys_common/backtrace.rs b/src/libstd/sys_common/backtrace.rs
index f434b62aced..43550ab04ca 100644
--- 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
-Subproject 5f28fda13efeb85097fe082af4b4827a58b0ecf
+Subproject 58e01ea4d7df69e658c034afbfa6d0abd90808e
diff --git a/src/tools/miri b/src/tools/miri
-Subproject e479ab26406ed8a473987e5f4a1f3be3e978e5d
+Subproject dd94c7c5a32be2ee0adeeaf9d46f26f14925797