From 2e00214b3efbdfeefaa0fe9e8b8fd519de7adc35 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:50 +0200 Subject: Merging upstream version 1.69.0+dfsg1. Signed-off-by: Daniel Baumann --- compiler/rustc_query_system/src/query/mod.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'compiler/rustc_query_system/src/query/mod.rs') diff --git a/compiler/rustc_query_system/src/query/mod.rs b/compiler/rustc_query_system/src/query/mod.rs index d308af192..383c63cd2 100644 --- a/compiler/rustc_query_system/src/query/mod.rs +++ b/compiler/rustc_query_system/src/query/mod.rs @@ -8,7 +8,8 @@ pub use self::job::{print_query_stack, QueryInfo, QueryJob, QueryJobId, QueryJob mod caches; pub use self::caches::{ - CacheSelector, DefaultCacheSelector, QueryCache, QueryStorage, VecCacheSelector, + CacheSelector, DefaultCacheSelector, QueryCache, QueryStorage, SingleCacheSelector, + VecCacheSelector, }; mod config; @@ -100,22 +101,22 @@ impl QuerySideEffects { } pub trait QueryContext: HasDepContext { - fn next_job_id(&self) -> QueryJobId; + fn next_job_id(self) -> QueryJobId; /// Get the query information from the TLS context. - fn current_query_job(&self) -> Option; + fn current_query_job(self) -> Option; - fn try_collect_active_jobs(&self) -> Option>; + fn try_collect_active_jobs(self) -> Option>; /// Load side effects associated to the node in the previous session. - fn load_side_effects(&self, prev_dep_node_index: SerializedDepNodeIndex) -> QuerySideEffects; + fn load_side_effects(self, prev_dep_node_index: SerializedDepNodeIndex) -> QuerySideEffects; /// Register diagnostics for the given node, for use in next session. - fn store_side_effects(&self, dep_node_index: DepNodeIndex, side_effects: QuerySideEffects); + fn store_side_effects(self, dep_node_index: DepNodeIndex, side_effects: QuerySideEffects); /// Register diagnostics for the given node, for use in next session. fn store_side_effects_for_anon_node( - &self, + self, dep_node_index: DepNodeIndex, side_effects: QuerySideEffects, ); @@ -124,12 +125,12 @@ pub trait QueryContext: HasDepContext { /// new query job while it executes. It returns the diagnostics /// captured during execution and the actual result. fn start_query( - &self, + self, token: QueryJobId, depth_limit: bool, diagnostics: Option<&Lock>>, compute: impl FnOnce() -> R, ) -> R; - fn depth_limit_error(&self, job: QueryJobId); + fn depth_limit_error(self, job: QueryJobId); } -- cgit v1.2.3