Declare queries in rustc_query_system.

Author: cjgillot

compiler/rustc_macros/src/query.rs

@@ -504,6 +504,7 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
                 }
             }
         }
+        #[macro_export]
         macro_rules! rustc_dep_node_append {
             ([$($macro:tt)*][$($other:tt)*]) => {
                 $($macro)*(

compiler/rustc_middle/src/lib.rs

@@ -64,6 +64,8 @@ extern crate rustc_macros;
 #[macro_use]
 extern crate rustc_data_structures;
 #[macro_use]
+extern crate rustc_query_system;
+#[macro_use]
 extern crate tracing;
 #[macro_use]
 extern crate smallvec;
@@ -74,9 +76,6 @@ mod tests;
 #[macro_use]
 mod macros;
 
-#[macro_use]
-pub mod query;
-
 #[macro_use]
 pub mod arena;
 #[macro_use]

compiler/rustc_query_impl/src/lib.rs

@@ -13,6 +13,8 @@
 extern crate rustc_macros;
 #[macro_use]
 extern crate rustc_middle;
+#[macro_use]
+extern crate rustc_query_system;
 
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};

compiler/rustc_middle/src/query/mod.rs renamed to compiler/rustc_query_system/src/decl.rs

@@ -52,7 +52,7 @@ rustc_queries! {
     ///
     /// This can be conveniently accessed by methods on `tcx.hir()`.
     /// Avoid calling this query directly.
-    query hir_owner(key: LocalDefId) -> Option<crate::hir::Owner<'tcx>> {
+    query hir_owner(key: LocalDefId) -> Option<rustc_middle::hir::Owner<'tcx>> {
         desc { |tcx| "HIR owner of `{}`", tcx.def_path_str(key.to_def_id()) }
     }
 
@@ -1139,7 +1139,7 @@ rustc_queries! {
         desc { "dylib dependency formats of crate" }
     }
 
-    query dependency_formats(_: ()) -> Lrc<crate::middle::dependency_format::Dependencies> {
+    query dependency_formats(_: ()) -> Lrc<rustc_middle::middle::dependency_format::Dependencies> {
         desc { "get the linkage format of all dependencies" }
     }
 

compiler/rustc_query_system/src/lib.rs

@@ -14,6 +14,9 @@ extern crate rustc_data_structures;
 #[macro_use]
 extern crate rustc_macros;
 
+#[macro_use]
+pub mod decl;
+
 pub mod cache;
 pub mod dep_graph;
 pub mod ich;