about summary refs log tree commit diff
path: root/compiler/rustc_query_system/src/query/job.rs
diff options
context:
space:
mode:
authornils <48135649+Nilstrieb@users.noreply.github.com>2023-03-28 12:51:12 +0200
committerGitHub <noreply@github.com>2023-03-28 12:51:12 +0200
commitc31f75209f0718e74b9ca48dab46c069c09744b1 (patch)
tree7c106a1b6e1d8e2042f803be806c3ec650f432e9 /compiler/rustc_query_system/src/query/job.rs
parent4bd33fdb4a40e82cf8572ca68a13e1e2fbef60f3 (diff)
parent27c44d2e28d9e1e38526dd52ac2f07336aabe254 (diff)
downloadrust-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_query_system/src/query/job.rs')
-rw-r--r--compiler/rustc_query_system/src/query/job.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_query_system/src/query/job.rs b/compiler/rustc_query_system/src/query/job.rs
index c9bc2240c21..a534b54070c 100644
--- a/compiler/rustc_query_system/src/query/job.rs
+++ b/compiler/rustc_query_system/src/query/job.rs
@@ -18,11 +18,11 @@ use std::num::NonZeroU64;
 #[cfg(parallel_compiler)]
 use {
     parking_lot::{Condvar, Mutex},
+    rayon_core,
     rustc_data_structures::fx::FxHashSet,
     rustc_data_structures::sync::Lock,
     rustc_data_structures::sync::Lrc,
     rustc_data_structures::{jobserver, OnDrop},
-    rustc_rayon_core as rayon_core,
     rustc_span::DUMMY_SP,
     std::iter,
     std::process,