diff options
| author | bors <bors@rust-lang.org> | 2025-06-21 05:19:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-06-21 05:19:08 +0000 |
| commit | df4ad9e28b9fb973e244ebc65a8167a261b8f45e (patch) | |
| tree | 1b17d0c6e48d7a5d09afa5fcddf63af774814b02 /compiler/rustc_interface/src | |
| parent | 15c701fbc995eb6c5b3a86021c18185f8eee020d (diff) | |
| parent | 432c7d0235a61bc4f54e8be7b072583a769d8b2a (diff) | |
| download | rust-df4ad9e28b9fb973e244ebc65a8167a261b8f45e.tar.gz rust-df4ad9e28b9fb973e244ebc65a8167a261b8f45e.zip | |
Auto merge of #142814 - tgross35:rollup-fioob6s, r=tgross35
Rollup of 8 pull requests Successful merges: - rust-lang/rust#142384 (Bringing `rustc_rayon_core` in tree as `rustc_thread_pool`) - rust-lang/rust#142476 (Insert parentheses around binary operation with attribute) - rust-lang/rust#142485 (Marks ADT live if it appears in pattern) - rust-lang/rust#142571 (Reason about borrowed classes in CopyProp.) - rust-lang/rust#142677 (Add CI check to ensure that rustdoc JSON `FORMAT_VERSION` is correctly updated) - rust-lang/rust#142716 (Adjust `with_generic_param_rib`.) - rust-lang/rust#142756 (Make `Clone` a `const_trait`) - rust-lang/rust#142765 (rustc_target: document public AbiMap-related fn and variants) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_interface/src')
| -rw-r--r-- | compiler/rustc_interface/src/util.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_interface/src/util.rs b/compiler/rustc_interface/src/util.rs index 8bdc24d47d9..8a7d6117265 100644 --- a/compiler/rustc_interface/src/util.rs +++ b/compiler/rustc_interface/src/util.rs @@ -208,7 +208,7 @@ pub(crate) fn run_in_thread_pool_with_globals< let proxy_ = Arc::clone(&proxy); let proxy__ = Arc::clone(&proxy); - let builder = rayon_core::ThreadPoolBuilder::new() + let builder = rustc_thread_pool::ThreadPoolBuilder::new() .thread_name(|_| "rustc".to_string()) .acquire_thread_handler(move || proxy_.acquire_thread()) .release_thread_handler(move || proxy__.release_thread()) @@ -218,7 +218,7 @@ pub(crate) fn run_in_thread_pool_with_globals< // locals to it. The new thread runs the deadlock handler. let current_gcx2 = current_gcx2.clone(); - let registry = rayon_core::Registry::current(); + let registry = rustc_thread_pool::Registry::current(); let session_globals = rustc_span::with_session_globals(|session_globals| { session_globals as *const SessionGlobals as usize }); @@ -265,7 +265,7 @@ pub(crate) fn run_in_thread_pool_with_globals< builder .build_scoped( // Initialize each new worker thread when created. - move |thread: rayon_core::ThreadBuilder| { + move |thread: rustc_thread_pool::ThreadBuilder| { // Register the thread for use with the `WorkerLocal` type. registry.register(); @@ -274,7 +274,7 @@ pub(crate) fn run_in_thread_pool_with_globals< }) }, // Run `f` on the first thread in the thread pool. - move |pool: &rayon_core::ThreadPool| { + move |pool: &rustc_thread_pool::ThreadPool| { pool.install(|| f(current_gcx.into_inner(), proxy)) }, ) |
