diff options
| author | nils <48135649+Nilstrieb@users.noreply.github.com> | 2023-03-28 12:51:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-28 12:51:12 +0200 |
| commit | c31f75209f0718e74b9ca48dab46c069c09744b1 (patch) | |
| tree | 7c106a1b6e1d8e2042f803be806c3ec650f432e9 /compiler/rustc_interface/src | |
| parent | 4bd33fdb4a40e82cf8572ca68a13e1e2fbef60f3 (diff) | |
| parent | 27c44d2e28d9e1e38526dd52ac2f07336aabe254 (diff) | |
| download | rust-c31f75209f0718e74b9ca48dab46c069c09744b1.tar.gz rust-c31f75209f0718e74b9ca48dab46c069c09744b1.zip | |
Rollup merge of #108480 - Zoxc:rayon-tlv, r=cuviper
Use Rayon's TLV directly This accesses Rayon's `TLV` thread local directly avoiding wrapper functions. This makes rustc work with https://github.com/rust-lang/rustc-rayon/pull/10. r? `@cuviper`
Diffstat (limited to 'compiler/rustc_interface/src')
| -rw-r--r-- | compiler/rustc_interface/src/util.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_interface/src/util.rs b/compiler/rustc_interface/src/util.rs index f3c80c6d854..612903810d2 100644 --- a/compiler/rustc_interface/src/util.rs +++ b/compiler/rustc_interface/src/util.rs @@ -183,7 +183,7 @@ pub(crate) fn run_in_thread_pool_with_globals<F: FnOnce() -> R + Send, R: Send>( .try_collect_active_jobs() .expect("active jobs shouldn't be locked in deadlock handler") }); - let registry = rustc_rayon_core::Registry::current(); + let registry = rayon_core::Registry::current(); thread::spawn(move || deadlock(query_map, ®istry)); }); if let Some(size) = get_stack_size() { |