bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

driver: replace lazy_static by SyncLazy from std

Browse source
This commit is contained in:
marmeladema 2020-09-01 21:49:36 +01:00
parent 73a7204983
commit 99c96c5bfe
4 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_driver/src/lib.rs
View file

@ -11,8 +11,6 @@
#[macro_use]
extern crate tracing;
#[macro_use]
extern crate lazy_static;
pub extern crate rustc_plugin_impl as plugin;
@ -49,6 +47,7 @@ use std::env;
use std::ffi::OsString;
use std::fs;
use std::io::{self, Read, Write};
use std::lazy::SyncLazy;
use std::mem;
use std::panic::{self, catch_unwind};
use std::path::PathBuf;
@ -1142,13 +1141,12 @@ pub fn catch_with_exit_code(f: impl FnOnce() -> interface::Result<()>) -> i32 {
}
}
lazy_static! {
static ref DEFAULT_HOOK: Box<dyn Fn(&panic::PanicInfo<'_>) + Sync + Send + 'static> = {
static DEFAULT_HOOK: SyncLazy<Box<dyn Fn(&panic::PanicInfo<'_>) + Sync + Send + 'static>> =
SyncLazy::new(|| {
let hook = panic::take_hook();
panic::set_hook(Box::new(|info| report_ice(info, BUG_REPORT_URL)));
hook
};
}
});
/// Prints the ICE message, including backtrace and query stack.
///
@ -1223,7 +1221,7 @@ pub fn report_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str) {
///
/// A custom rustc driver can skip calling this to set up a custom ICE hook.
pub fn install_ice_hook() {
lazy_static::initialize(&DEFAULT_HOOK);
SyncLazy::force(&DEFAULT_HOOK);
}
/// This allows tools to enable rust logging without having to magically match rustc's