From e321ba989c9f03748d5c19aead84edfcc9e9e69a Mon Sep 17 00:00:00 2001
From: Camille GILLOT <gillot.camille@gmail.com>
Date: Wed, 27 Nov 2019 13:24:19 +0100
Subject: [PATCH] Misc renames.

---
 src/librustc/ty/context.rs        | 4 ++--
 src/librustc_interface/passes.rs  | 7 +++----
 src/librustc_interface/queries.rs | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
index 91afa0153c8b..3c1cfa3f79f3 100644
--- a/src/librustc/ty/context.rs
+++ b/src/librustc/ty/context.rs
@@ -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>,
@@ -1226,7 +1226,7 @@ impl<'tcx> TyCtxt<'tcx> {
             sess: s,
             lint_store,
             cstore,
-            arena: local_arena,
+            arena,
             interners,
             dep_graph,
             prof: s.prof.clone(),
diff --git a/src/librustc_interface/passes.rs b/src/librustc_interface/passes.rs
index 66666a027c0d..1df84ce0b739 100644
--- a/src/librustc_interface/passes.rs
+++ b/src/librustc_interface/passes.rs
@@ -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);
@@ -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);
     }
 
@@ -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,
diff --git a/src/librustc_interface/queries.rs b/src/librustc_interface/queries.rs
index 7e8ba9f27025..53ab5eb990dd 100644
--- a/src/librustc_interface/queries.rs
+++ b/src/librustc_interface/queries.rs
@@ -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>,
@@ -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(),
@@ -269,7 +269,7 @@ impl<'tcx> Queries<'tcx> {
                 &crate_name,
                 &self.gcx,
                 &self.all_arenas,
-                &self.local_arena,
+                &self.arena,
             ))
         })
     }