Inline QueryAccessor::query.

diff --git a/src/librustc/ty/query/config.rs b/src/librustc/ty/query/config.rs
index 5a05acc90e43fe4e629d4371a9ea2434f652ac3c..29b9e0c3b40ef2c223cea26139f566743be23be2 100644 (file)
--- a/src/librustc/ty/query/config.rs
+++ b/src/librustc/ty/query/config.rs
@@ -2,7 +2,7 @@
 use crate::dep_graph::{DepKind, DepNode};
 use crate::ty::query::caches::QueryCache;
 use crate::ty::query::plumbing::CycleError;
-use crate::ty::query::{Query, QueryState};
+use crate::ty::query::QueryState;
 use crate::ty::TyCtxt;
 use rustc_data_structures::profiling::ProfileCategory;
 use rustc_hir::def_id::DefId;
@@ -32,8 +32,6 @@ pub(crate) trait QueryAccessors<'tcx>: QueryConfig<'tcx> {
 
     type Cache: QueryCache<Self::Key, Self::Value>;
 
-    fn query(key: Self::Key) -> Query<'tcx>;
-
     // Don't use this method to access query results, instead use the methods on TyCtxt
     fn query_state<'a>(tcx: TyCtxt<'tcx>) -> &'a QueryState<'tcx, Self>;
 

diff --git a/src/librustc/ty/query/plumbing.rs b/src/librustc/ty/query/plumbing.rs
index 603c4fd9b72c365afca6d17eb2383f2d7e6acac5..32138b3e1d5fe3116bb6b698208f6fd1c0ba67be 100644 (file)
--- a/src/librustc/ty/query/plumbing.rs
+++ b/src/librustc/ty/query/plumbing.rs
@@ -877,7 +877,7 @@ pub fn try_collect_active_jobs(
                                 };
                                 let info = QueryInfo {
                                     span: job.span,
-                                    query: queries::$name::query(k.clone())
+                                    query: Query::$name(k.clone())
                                 };
                                 Some((id, QueryJobInfo { info,  job: job.clone() }))
                         } else {
@@ -965,11 +965,6 @@ impl<$tcx> QueryAccessors<$tcx> for queries::$name<$tcx> {
 
             type Cache = query_storage!([$($modifiers)*][$K, $V]);
 
-            #[inline(always)]
-            fn query(key: Self::Key) -> Query<'tcx> {
-                Query::$name(key)
-            }
-
             #[inline(always)]
             fn query_state<'a>(tcx: TyCtxt<$tcx>) -> &'a QueryState<$tcx, Self> {
                 &tcx.queries.$name