diff options
| author | bors <bors@rust-lang.org> | 2019-09-10 04:30:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-10 04:30:32 +0000 |
| commit | 61dced18277a8cd55c963502db5a4cdf837858f3 (patch) | |
| tree | 6fedbb2a022b44149e143f142980048cfb2578bb /src/libstd | |
| parent | 122fefc63e4c2bab7f76bb24a7ab056b7bc7b37e (diff) | |
| parent | 59156af1e7e64172ecfd80b96fa2680cc0225462 (diff) | |
| download | rust-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/libstd')
| -rw-r--r-- | src/libstd/sys_common/backtrace.rs | 6 |
1 files changed, 6 insertions, 0 deletions
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 => {} |
