Skip to content

Commit

Permalink
Remove setup_callbacks_and_run_in_default_thread_pool_with_globals().
Browse files Browse the repository at this point in the history
It's a very thin wrapper around
`setup_callbacks_and_run_in_thread_pool_with_globals()` and it has a
single call site.
  • Loading branch information
nnethercote committed Aug 5, 2020
1 parent 5301407 commit af4e3e0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
11 changes: 0 additions & 11 deletions src/librustc_interface/interface.rs
Expand Up @@ -17,7 +17,6 @@ use rustc_session::early_error;
use rustc_session::lint;
use rustc_session::parse::{CrateConfig, ParseSess};
use rustc_session::{DiagnosticOutput, Session};
use rustc_span::edition;
use rustc_span::source_map::{FileLoader, FileName};
use std::path::PathBuf;
use std::result;
Expand Down Expand Up @@ -208,13 +207,3 @@ pub fn run_compiler<R: Send>(mut config: Config, f: impl FnOnce(&Compiler) -> R
|| create_compiler_and_run(config, f),
)
}

pub fn setup_callbacks_and_run_in_default_thread_pool_with_globals<R: Send>(
edition: edition::Edition,
f: impl FnOnce() -> R + Send,
) -> R {
// the 1 here is duplicating code in config.opts.debugging_opts.threads
// which also defaults to 1; it ultimately doesn't matter as the default
// isn't threaded, and just ignores this parameter
util::setup_callbacks_and_run_in_thread_pool_with_globals(edition, 1, &None, f)
}
4 changes: 3 additions & 1 deletion src/librustdoc/lib.rs
Expand Up @@ -431,8 +431,10 @@ fn main_args(args: &[String]) -> MainResult {
Ok(opts) => opts,
Err(code) => return if code == 0 { Ok(()) } else { Err(ErrorReported) },
};
rustc_interface::interface::setup_callbacks_and_run_in_default_thread_pool_with_globals(
rustc_interface::util::setup_callbacks_and_run_in_thread_pool_with_globals(
options.edition,
1, // this runs single-threaded, even in a parallel compiler
&None,
move || main_options(options),
)
}
Expand Down

0 comments on commit af4e3e0

Please sign in to comment.