user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustc: rename ty::maps to ty::query.

Browse source
This commit is contained in:
Eduard-Mihai Burtescu 2018-06-13 16:44:43 +03:00
parent 7f20af002e
commit 5a5c7ded0d
57 changed files with 247 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/librustc_driver/driver.rs
View file

@ -87,7 +87,7 @@ pub fn spawn_thread_pool<F: FnOnce(config::Options) -> R + sync::Send, R: sync::
let config = ThreadPoolBuilder::new()
.num_threads(Session::query_threads_from_opts(&opts))
.deadlock_handler(|| unsafe { ty::maps::handle_deadlock() })
.deadlock_handler(|| unsafe { ty::query::handle_deadlock() })
.stack_size(16 * 1024 * 1024);
let with_pool = move |pool: &ThreadPool| {
@ -399,10 +399,10 @@ pub struct CompileController<'a> {
/// Allows overriding default rustc query providers,
/// after `default_provide` has installed them.
pub provide: Box<Fn(&mut ty::maps::Providers) + 'a>,
pub provide: Box<Fn(&mut ty::query::Providers) + 'a>,
/// Same as `provide`, but only for non-local crates,
/// applied after `default_provide_extern`.
pub provide_extern: Box<Fn(&mut ty::maps::Providers) + 'a>,
pub provide_extern: Box<Fn(&mut ty::query::Providers) + 'a>,
}
impl<'a> CompileController<'a> {
@ -1140,7 +1140,7 @@ where
})
}
pub fn default_provide(providers: &mut ty::maps::Providers) {
pub fn default_provide(providers: &mut ty::query::Providers) {
hir::provide(providers);
borrowck::provide(providers);
mir::provide(providers);
@ -1158,7 +1158,7 @@ pub fn default_provide(providers: &mut ty::maps::Providers) {
lint::provide(providers);
}
pub fn default_provide_extern(providers: &mut ty::maps::Providers) {
pub fn default_provide_extern(providers: &mut ty::query::Providers) {
cstore::provide_extern(providers);
}
@ -1203,7 +1203,7 @@ where
time(sess, "loop checking", || loops::check_crate(sess, &hir_map));
let mut local_providers = ty::maps::Providers::default();
let mut local_providers = ty::query::Providers::default();
default_provide(&mut local_providers);
codegen_backend.provide(&mut local_providers);
(control.provide)(&mut local_providers);

6
src/librustc_driver/test.rs
View file

@ -20,7 +20,7 @@ use rustc::middle::region;
use rustc::ty::subst::Subst;
use rustc::traits::ObligationCause;
use rustc::ty::{self, Ty, TyCtxt, TypeFoldable};
use rustc::ty::maps::OnDiskCache;
use rustc::ty::query::OnDiskCache;
use rustc::infer::{self, InferOk, InferResult};
use rustc::infer::outlives::env::OutlivesEnvironment;
use rustc::infer::type_variable::TypeVariableOrigin;
@ -157,8 +157,8 @@ fn test_env_with_pool<F>(
};
TyCtxt::create_and_enter(&sess,
&cstore,
ty::maps::Providers::default(),
ty::maps::Providers::default(),
ty::query::Providers::default(),
ty::query::Providers::default(),
&arenas,
resolutions,
hir_map,