Remove now-redundant tcx field

Author: oli-obk

compiler/rustc_hir_analysis/src/collect.rs

@@ -117,7 +117,6 @@ pub fn provide(providers: &mut Providers) {
 /// `probe_ty_param_bounds` requests, drawing the information from
 /// the HIR (`hir::Generics`), recursively.
 pub struct ItemCtxt<'tcx> {
-    tcx: TyCtxt<'tcx>,
     item_def_id: LocalDefId,
     infcx: InferCtxt<'tcx>,
 }
@@ -341,19 +340,19 @@ fn bad_placeholder<'tcx>(
 
 impl<'tcx> ItemCtxt<'tcx> {
     pub fn new(tcx: TyCtxt<'tcx>, item_def_id: LocalDefId) -> ItemCtxt<'tcx> {
-        ItemCtxt { tcx, item_def_id, infcx: tcx.infer_ctxt().ignoring_regions().build() }
+        ItemCtxt { item_def_id, infcx: tcx.infer_ctxt().ignoring_regions().build() }
     }
 
     pub fn lower_ty(&self, hir_ty: &hir::Ty<'tcx>) -> Ty<'tcx> {
         self.lowerer().lower_ty(hir_ty)
     }
 
     pub fn hir_id(&self) -> hir::HirId {
-        self.tcx.local_def_id_to_hir_id(self.item_def_id)
+        self.tcx().local_def_id_to_hir_id(self.item_def_id)
     }
 
     pub fn node(&self) -> hir::Node<'tcx> {
-        self.tcx.hir_node(self.hir_id())
+        self.tcx().hir_node(self.hir_id())
     }
 
     fn check_tainted_by_errors(&self) -> Result<(), ErrorGuaranteed> {
@@ -366,7 +365,7 @@ impl<'tcx> ItemCtxt<'tcx> {
 
 impl<'tcx> HirTyLowerer<'tcx> for ItemCtxt<'tcx> {
     fn tcx(&self) -> TyCtxt<'tcx> {
-        self.tcx
+        self.infcx.tcx
     }
 
     fn item_def_id(&self) -> LocalDefId {
@@ -386,7 +385,7 @@ impl<'tcx> HirTyLowerer<'tcx> for ItemCtxt<'tcx> {
     }
 
     fn ct_infer(&self, ty: Ty<'tcx>, _: Option<&ty::GenericParamDef>, span: Span) -> Const<'tcx> {
-        let ty = self.tcx.fold_regions(ty, |r, _| match *r {
+        let ty = self.tcx().fold_regions(ty, |r, _| match *r {
             rustc_type_ir::RegionKind::ReStatic => r,
 
             // This is never reached in practice. If it ever is reached,
@@ -403,7 +402,7 @@ impl<'tcx> HirTyLowerer<'tcx> for ItemCtxt<'tcx> {
         def_id: LocalDefId,
         assoc_name: Ident,
     ) -> ty::GenericPredicates<'tcx> {
-        self.tcx.at(span).type_param_predicates((self.item_def_id, def_id, assoc_name))
+        self.tcx().at(span).type_param_predicates((self.item_def_id, def_id, assoc_name))
     }
 
     fn lower_assoc_ty(
@@ -429,14 +428,15 @@ impl<'tcx> HirTyLowerer<'tcx> for ItemCtxt<'tcx> {
             match self.node() {
                 hir::Node::Field(_) | hir::Node::Ctor(_) | hir::Node::Variant(_) => {
                     let item = self
-                        .tcx
+                        .tcx()
                         .hir()
-                        .expect_item(self.tcx.hir().get_parent_item(self.hir_id()).def_id);
+                        .expect_item(self.tcx().hir().get_parent_item(self.hir_id()).def_id);
                     match &item.kind {
                         hir::ItemKind::Enum(_, generics)
                         | hir::ItemKind::Struct(_, generics)
                         | hir::ItemKind::Union(_, generics) => {
-                            let lt_name = get_new_lifetime_name(self.tcx, poly_trait_ref, generics);
+                            let lt_name =
+                                get_new_lifetime_name(self.tcx(), poly_trait_ref, generics);
                             let (lt_sp, sugg) = match generics.params {
                                 [] => (generics.span, format!("<{lt_name}>")),
                                 [bound, ..] => (bound.span.shrink_to_lo(), format!("{lt_name}, ")),
@@ -448,10 +448,10 @@ impl<'tcx> HirTyLowerer<'tcx> for ItemCtxt<'tcx> {
                                 second: format!(
                                     "{}::",
                                     // Replace the existing lifetimes with a new named lifetime.
-                                    self.tcx.instantiate_bound_regions_uncached(
+                                    self.tcx().instantiate_bound_regions_uncached(
                                         poly_trait_ref,
                                         |_| {
-                                            ty::Region::new_early_param(self.tcx, ty::EarlyParamRegion {
+                                            ty::Region::new_early_param(self.tcx(), ty::EarlyParamRegion {
                                                 index: 0,
                                                 name: Symbol::intern(&lt_name),
                                             })
@@ -476,7 +476,7 @@ impl<'tcx> HirTyLowerer<'tcx> for ItemCtxt<'tcx> {
                     bound = format!(
                         "{}::",
                         // Erase named lt, we want `<A as B<'_>::C`, not `<A as B<'a>::C`.
-                        self.tcx.anonymize_bound_vars(poly_trait_ref).skip_binder(),
+                        self.tcx().anonymize_bound_vars(poly_trait_ref).skip_binder(),
                     );
                 }
                 _ => {}

compiler/rustc_hir_analysis/src/collect/predicates_of.rs

@@ -729,7 +729,7 @@ impl<'tcx> ItemCtxt<'tcx> {
                 continue;
             };
 
-            let bound_vars = self.tcx.late_bound_vars(predicate.hir_id);
+            let bound_vars = self.tcx().late_bound_vars(predicate.hir_id);
             self.lowerer().lower_poly_bounds(
                 bound_ty,
                 predicate.bounds.iter().filter(|bound| {
@@ -751,7 +751,7 @@ impl<'tcx> ItemCtxt<'tcx> {
             hir::GenericBound::Trait(poly_trait_ref, _) => {
                 let trait_ref = &poly_trait_ref.trait_ref;
                 if let Some(trait_did) = trait_ref.trait_def_id() {
-                    self.tcx.trait_may_define_assoc_item(trait_did, assoc_name)
+                    self.tcx().trait_may_define_assoc_item(trait_did, assoc_name)
                 } else {
                     false
                 }