Skip to content

Commit 21ed505

Browse files
committed
Auto merge of #68693 - Zoxc:query-no-arc, r=michaelwoerister
Construct query job latches on-demand r? @michaelwoerister
2 parents 1010408 + 5206827 commit 21ed505

File tree

5 files changed

+323
-161
lines changed

5 files changed

+323
-161
lines changed

src/librustc/ty/context.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1612,7 +1612,7 @@ pub mod tls {
16121612

16131613
use crate::dep_graph::TaskDeps;
16141614
use crate::ty::query;
1615-
use rustc_data_structures::sync::{self, Lock, Lrc};
1615+
use rustc_data_structures::sync::{self, Lock};
16161616
use rustc_data_structures::thin_vec::ThinVec;
16171617
use rustc_data_structures::OnDrop;
16181618
use rustc_errors::Diagnostic;
@@ -1637,7 +1637,7 @@ pub mod tls {
16371637

16381638
/// The current query job, if any. This is updated by `JobOwner::start` in
16391639
/// `ty::query::plumbing` when executing a query.
1640-
pub query: Option<Lrc<query::QueryJob<'tcx>>>,
1640+
pub query: Option<query::QueryJobId>,
16411641

16421642
/// Where to store diagnostics for the current query job, if any.
16431643
/// This is updated by `JobOwner::start` in `ty::query::plumbing` when executing a query.

0 commit comments

Comments
 (0)