squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #59496 - Zoxc:fix-globals, r=oli-obk

Browse source 
Remove unnecessary with_globals calls
This commit is contained in:
Mazdak Farrokhzad 2019-03-29 02:40:56 +01:00 committed by GitHub
commit bf3e6c63d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/librustc_interface/interface.rs
View file

@ -136,14 +136,12 @@ where
F: FnOnce(&Compiler) -> R + Send,
R: Send,
{
syntax::with_globals(move || {
let stderr = config.stderr.take();
util::spawn_thread_pool(
config.opts.debugging_opts.threads,
&stderr,
|| run_compiler_in_existing_thread_pool(config, f),
)
})
let stderr = config.stderr.take();
util::spawn_thread_pool(
config.opts.debugging_opts.threads,
&stderr,
|| run_compiler_in_existing_thread_pool(config, f),
)
}
pub fn default_thread_pool<F, R>(f: F) -> R

4
src/librustdoc/lib.rs
View file

@ -443,7 +443,7 @@ where R: 'static + Send,
let (tx, rx) = channel();
let result = rustc_driver::report_ices_to_stderr_if_any(move || syntax::with_globals(move || {
let result = rustc_driver::report_ices_to_stderr_if_any(move || {
let crate_name = options.crate_name.clone();
let crate_version = options.crate_version.clone();
let (mut krate, renderinfo, renderopts, passes) = core::run_core(options);
@ -462,7 +462,7 @@ where R: 'static + Send,
renderopts,
passes: passes
})).unwrap();
}));
});
match result {
Ok(()) => rx.recv().unwrap(),