Skip to content

Commit 61dced1

Browse files
committed
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
2 parents 122fefc + 59156af commit 61dced1

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

src/doc/reference

src/libstd/sys_common/backtrace.rs

+6
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@ where
117117
// For now logging is turned off by default, and this function checks to see
118118
// whether the magical environment variable is present to see if it's turned on.
119119
pub fn log_enabled() -> Option<PrintFmt> {
120+
// Setting environment variables for Fuchsia components isn't a standard
121+
// or easily supported workflow. For now, always display backtraces.
122+
if cfg!(target_os = "fuchsia") {
123+
return Some(PrintFmt::Full);
124+
}
125+
120126
static ENABLED: atomic::AtomicIsize = atomic::AtomicIsize::new(0);
121127
match ENABLED.load(Ordering::SeqCst) {
122128
0 => {}

src/tools/clippy

0 commit comments

Comments
 (0)