user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Specify the edition for the rustdoc thread-pool

Browse source
This commit is contained in:
John Kåre Alsaker 2019-05-20 03:39:48 +02:00
parent a1f2dceaeb
commit 0b37900b40
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_interface/interface.rs
View file

@ -143,10 +143,10 @@ where
)
}
pub fn default_thread_pool<F, R>(f: F) -> R
pub fn default_thread_pool<F, R>(edition: edition::Edition, f: F) -> R
where
F: FnOnce() -> R + Send,
R: Send,
{
util::spawn_thread_pool(edition::DEFAULT_EDITION, None, &None, f)
util::spawn_thread_pool(edition, None, &None, f)
}

9
src/librustdoc/lib.rs
View file

@ -94,9 +94,7 @@ pub fn main() {
rustc_driver::set_sigpipe_handler();
env_logger::init();
let res = std::thread::Builder::new().stack_size(thread_stack_size).spawn(move || {
rustc_interface::interface::default_thread_pool(move || {
get_args().map(|args| main_args(&args)).unwrap_or(1)
})
get_args().map(|args| main_args(&args)).unwrap_or(1)
}).unwrap().join().unwrap_or(rustc_driver::EXIT_FAILURE);
process::exit(res);
}
@ -382,7 +380,12 @@ fn main_args(args: &[String]) -> i32 {
Ok(opts) => opts,
Err(code) => return code,
};
rustc_interface::interface::default_thread_pool(options.edition, move || {
main_options(options)
})
}
fn main_options(options: config::Options) -> i32 {
let diag = core::new_handler(options.error_format,
None,
options.debugging_options.treat_err_as_bug,