Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Misc renames.
  • Loading branch information
cjgillot committed Nov 27, 2019
1 parent 77a4c85 commit e321ba9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/librustc/ty/context.rs
Expand Up @@ -1170,7 +1170,7 @@ impl<'tcx> TyCtxt<'tcx> {
local_providers: ty::query::Providers<'tcx>,
extern_providers: ty::query::Providers<'tcx>,
arenas: &'tcx AllArenas,
local_arena: &'tcx WorkerLocal<Arena<'tcx>>,
arena: &'tcx WorkerLocal<Arena<'tcx>>,
resolutions: ty::ResolverOutputs,
hir: hir_map::Map<'tcx>,
on_disk_query_result_cache: query::OnDiskCache<'tcx>,
Expand Down Expand Up @@ -1226,7 +1226,7 @@ impl<'tcx> TyCtxt<'tcx> {
sess: s,
lint_store,
cstore,
arena: local_arena,
arena,
interners,
dep_graph,
prof: s.prof.clone(),
Expand Down
7 changes: 3 additions & 4 deletions src/librustc_interface/passes.rs
Expand Up @@ -765,7 +765,7 @@ pub fn create_global_ctxt<'tcx>(
crate_name: &str,
global_ctxt: &'tcx Once<GlobalCtxt<'tcx>>,
all_arenas: &'tcx AllArenas,
local_arena: &'tcx WorkerLocal<Arena<'tcx>>,
arena: &'tcx WorkerLocal<Arena<'tcx>>,
) -> QueryContext<'tcx> {
let sess = &compiler.session();
let defs = mem::take(&mut resolver_outputs.definitions);
Expand All @@ -788,8 +788,7 @@ pub fn create_global_ctxt<'tcx>(
default_provide_extern(&mut extern_providers);
codegen_backend.provide_extern(&mut extern_providers);

let override_queries = compiler.override_queries;
if let Some(callback) = override_queries {
if let Some(callback) = compiler.override_queries {
callback(sess, &mut local_providers, &mut extern_providers);
}

Expand All @@ -799,7 +798,7 @@ pub fn create_global_ctxt<'tcx>(
local_providers,
extern_providers,
&all_arenas,
local_arena,
arena,
resolver_outputs,
hir_map,
query_result_on_disk_cache,
Expand Down
6 changes: 3 additions & 3 deletions src/librustc_interface/queries.rs
Expand Up @@ -75,7 +75,7 @@ pub struct Queries<'tcx> {
forest: Once<hir::map::Forest>,

all_arenas: AllArenas,
local_arena: WorkerLocal<Arena<'tcx>>,
arena: WorkerLocal<Arena<'tcx>>,

dep_graph_future: Query<Option<DepGraphFuture>>,
parse: Query<ast::Crate>,
Expand All @@ -96,7 +96,7 @@ impl<'tcx> Queries<'tcx> {
gcx: Once::new(),
forest: Once::new(),
all_arenas: AllArenas::new(),
local_arena: WorkerLocal::new(|_| Arena::default()),
arena: WorkerLocal::new(|_| Arena::default()),
dep_graph_future: Default::default(),
parse: Default::default(),
crate_name: Default::default(),
Expand Down Expand Up @@ -269,7 +269,7 @@ impl<'tcx> Queries<'tcx> {
&crate_name,
&self.gcx,
&self.all_arenas,
&self.local_arena,
&self.arena,
))
})
}
Expand Down

0 comments on commit e321ba9

Please sign in to comment.