Rename BoxedGlobalCtxt.

src/librustc_interface/passes.rs

@@ -741,9 +741,9 @@ pub fn default_provide_extern(providers: &mut ty::query::Providers<'_>) {
  rustc_codegen_ssa::provide_extern(providers);
 }
 
-pub struct BoxedGlobalCtxt<'tcx>(&'tcx GlobalCtxt<'tcx>);
+pub struct QueryContext<'tcx>(&'tcx GlobalCtxt<'tcx>);
 
-impl<'tcx> BoxedGlobalCtxt<'tcx> {
+impl<'tcx> QueryContext<'tcx> {
  pub fn enter<F, R>(&mut self, f: F) -> R
  where
  F: FnOnce(TyCtxt<'tcx>) -> R,
@@ -766,7 +766,7 @@ pub fn create_global_ctxt<'tcx>(
  global_ctxt: &'tcx Once<GlobalCtxt<'tcx>>,
  arenas: &'tcx Once<AllArenas>,
  local_arena: &'tcx WorkerLocal<Arena<'tcx>>,
-) -> BoxedGlobalCtxt<'tcx> {
+) -> QueryContext<'tcx> {
  let sess = &compiler.session();
  let defs = mem::take(&mut resolver_outputs.definitions);
 
@@ -813,7 +813,7 @@ pub fn create_global_ctxt<'tcx>(
  time(tcx.sess, "dep graph tcx init", || rustc_incremental::dep_graph_tcx_init(tcx));
  });
 
- BoxedGlobalCtxt(gcx)
+ QueryContext(gcx)
 }
 
 /// Runs the resolution, type-checking, region checking and other

src/librustc_interface/queries.rs

@@ -1,5 +1,5 @@
 use crate::interface::{Compiler, Result};
-use crate::passes::{self, BoxedResolver, BoxedGlobalCtxt};
+use crate::passes::{self, BoxedResolver, QueryContext};
 
 use rustc_incremental::DepGraphFuture;
 use rustc_data_structures::sync::{Lrc, Once, WorkerLocal};
@@ -85,7 +85,7 @@ pub struct Queries<'tcx> {
  dep_graph: Query<DepGraph>,
  lower_to_hir: Query<(&'tcx hir::map::Forest, Steal<ResolverOutputs>)>,
  prepare_outputs: Query<OutputFilenames>,
- global_ctxt: Query<BoxedGlobalCtxt<'tcx>>,
+ global_ctxt: Query<QueryContext<'tcx>>,
  ongoing_codegen: Query<Box<dyn Any>>,
 }
 
@@ -253,7 +253,7 @@ impl<'tcx> Queries<'tcx> {
  })
  }
 
- pub fn global_ctxt(&'tcx self) -> Result<&Query<BoxedGlobalCtxt<'tcx>>> {
+ pub fn global_ctxt(&'tcx self) -> Result<&Query<QueryContext<'tcx>>> {
  self.global_ctxt.compute(|| {
  let crate_name = self.crate_name()?.peek().clone();
  let outputs = self.prepare_outputs()?.peek().clone();