mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 14:55:26 +00:00
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
This commit is contained in:
commit
61dced1827
@ -1 +1 @@
|
||||
Subproject commit 090c015f7939665866432c334957bd536c811870
|
||||
Subproject commit 1944efed35989ba57fa397c0724c4921310311fc
|
@ -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 => {}
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 5f28fda13efeb85097fe082af4b4827a58b0ecf6
|
||||
Subproject commit 58e01ea4d7df69e658c034afbfa6d0abd90808ed
|
@ -1 +1 @@
|
||||
Subproject commit e479ab26406ed8a473987e5f4a1f3be3e978e5d2
|
||||
Subproject commit dd94c7c5a32be2ee0adeeaf9d46f26f14925797c
|
Loading…
Reference in New Issue
Block a user