bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Move keys module.

Browse source
This commit is contained in:
Camille GILLOT 2022-10-31 22:54:09 +00:00
parent 15d2f62bd2
commit ade5cffc2b
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_query_impl/src/keys.rs → compiler/rustc_middle/src/query/keys.rs
View file

@ -1,13 +1,13 @@
//! Defines the set of legal keys that can be used in queries. //! Defines the set of legal keys that can be used in queries.
use crate::infer::canonical::Canonical;
use crate::mir;
use crate::traits;
use crate::ty::fast_reject::SimplifiedType;
use crate::ty::subst::{GenericArg, SubstsRef};
use crate::ty::{self, layout::TyAndLayout, Ty, TyCtxt};
use rustc_hir::def_id::{CrateNum, DefId, LocalDefId, LOCAL_CRATE}; use rustc_hir::def_id::{CrateNum, DefId, LocalDefId, LOCAL_CRATE};
use rustc_hir::hir_id::{HirId, OwnerId}; use rustc_hir::hir_id::{HirId, OwnerId};
use rustc_middle::infer::canonical::Canonical;
use rustc_middle::mir;
use rustc_middle::traits;
use rustc_middle::ty::fast_reject::SimplifiedType;
use rustc_middle::ty::subst::{GenericArg, SubstsRef};
use rustc_middle::ty::{self, layout::TyAndLayout, Ty, TyCtxt};
use rustc_span::symbol::{Ident, Symbol}; use rustc_span::symbol::{Ident, Symbol};
use rustc_span::{Span, DUMMY_SP}; use rustc_span::{Span, DUMMY_SP};

3
compiler/rustc_middle/src/query/mod.rs
View file

@ -7,6 +7,9 @@
use crate::ty::{self, print::describe_as_module, TyCtxt}; use crate::ty::{self, print::describe_as_module, TyCtxt};
use rustc_span::def_id::LOCAL_CRATE; use rustc_span::def_id::LOCAL_CRATE;
mod keys;
pub use keys::Key;
// Each of these queries corresponds to a function pointer field in the // Each of these queries corresponds to a function pointer field in the
// `Providers` struct for requesting a value of that type, and a method // `Providers` struct for requesting a value of that type, and a method
// on `tcx: TyCtxt` (and `tcx.at(span)`) for doing that request in a way // on `tcx: TyCtxt` (and `tcx.at(span)`) for doing that request in a way

3
compiler/rustc_query_impl/src/lib.rs
View file

@ -32,8 +32,7 @@ use rustc_query_system::query::*;
#[cfg(parallel_compiler)] #[cfg(parallel_compiler)]
pub use rustc_query_system::query::{deadlock, QueryContext}; pub use rustc_query_system::query::{deadlock, QueryContext};
mod keys; use rustc_middle::query::Key;
use keys::Key;
pub use rustc_query_system::query::QueryConfig; pub use rustc_query_system::query::QueryConfig;
pub(crate) use rustc_query_system::query::{QueryDescription, QueryVTable}; pub(crate) use rustc_query_system::query::{QueryDescription, QueryVTable};

2
compiler/rustc_query_impl/src/plumbing.rs
View file

@ -2,7 +2,6 @@
//! generate the actual methods on tcx which find and execute the provider, //! generate the actual methods on tcx which find and execute the provider,
//! manage the caches, and so forth. //! manage the caches, and so forth.
use crate::keys::Key;
use crate::on_disk_cache::{CacheDecoder, CacheEncoder, EncodedDepNodeIndex}; use crate::on_disk_cache::{CacheDecoder, CacheEncoder, EncodedDepNodeIndex};
use crate::profiling_support::QueryKeyStringCache; use crate::profiling_support::QueryKeyStringCache;
use crate::{on_disk_cache, Queries}; use crate::{on_disk_cache, Queries};
@ -12,6 +11,7 @@ use rustc_errors::{Diagnostic, Handler};
use rustc_middle::dep_graph::{ use rustc_middle::dep_graph::{
self, DepKind, DepKindStruct, DepNode, DepNodeIndex, SerializedDepNodeIndex, self, DepKind, DepKindStruct, DepNode, DepNodeIndex, SerializedDepNodeIndex,
}; };
use rustc_middle::query::Key;
use rustc_middle::ty::tls::{self, ImplicitCtxt}; use rustc_middle::ty::tls::{self, ImplicitCtxt};
use rustc_middle::ty::{self, TyCtxt}; use rustc_middle::ty::{self, TyCtxt};
use rustc_query_system::dep_graph::{DepNodeParams, HasDepContext}; use rustc_query_system::dep_graph::{DepNodeParams, HasDepContext};