Rename a bunch of things · rust-lang/rust@ec88615 (original) (raw)
`@@ -397,7 +397,7 @@ struct RemapLateBound<'a, 'tcx> {
`
397
397
`}
`
398
398
``
399
399
`impl<'tcx> TypeFolder<TyCtxt<'tcx>> for RemapLateBound<'_, 'tcx> {
`
400
``
`-
fn interner(&self) -> TyCtxt<'tcx> {
`
``
400
`+
fn cx(&self) -> TyCtxt<'tcx> {
`
401
401
`self.tcx
`
402
402
`}
`
403
403
``
`@@ -790,13 +790,13 @@ impl<'tcx, E> TypeFolder<TyCtxt<'tcx>> for ImplTraitInTraitCollector<'_, 'tcx, E
`
790
790
`where
`
791
791
`E: 'tcx,
`
792
792
`{
`
793
``
`-
fn interner(&self) -> TyCtxt<'tcx> {
`
``
793
`+
fn cx(&self) -> TyCtxt<'tcx> {
`
794
794
`self.ocx.infcx.tcx
`
795
795
`}
`
796
796
``
797
797
`fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {
`
798
798
`if let ty::Alias(ty::Projection, proj) = ty.kind()
`
799
``
`-
&& self.interner().is_impl_trait_in_trait(proj.def_id)
`
``
799
`+
&& self.cx().is_impl_trait_in_trait(proj.def_id)
`
800
800
`{
`
801
801
`if let Some((ty, _)) = self.types.get(&proj.def_id) {
`
802
802
`return *ty;
`
`@@ -810,9 +810,9 @@ where
`
810
810
`self.types.insert(proj.def_id, (infer_ty, proj.args));
`
811
811
`// Recurse into bounds
`
812
812
`for (pred, pred_span) in self
`
813
``
`-
.interner()
`
``
813
`+
.cx()
`
814
814
`.explicit_item_bounds(proj.def_id)
`
815
``
`-
.iter_instantiated_copied(self.interner(), proj.args)
`
``
815
`+
.iter_instantiated_copied(self.cx(), proj.args)
`
816
816
`{
`
817
817
`let pred = pred.fold_with(self);
`
818
818
`let pred = self.ocx.normalize(
`
`@@ -822,7 +822,7 @@ where
`
822
822
`);
`
823
823
``
824
824
`self.ocx.register_obligation(traits::Obligation::new(
`
825
``
`-
self.interner(),
`
``
825
`+
self.cx(),
`
826
826
`ObligationCause::new(
`
827
827
`self.span,
`
828
828
`self.body_id,
`
`@@ -853,7 +853,7 @@ struct RemapHiddenTyRegions<'tcx> {
`
853
853
`impl<'tcx> ty::FallibleTypeFolder<TyCtxt<'tcx>> for RemapHiddenTyRegions<'tcx> {
`
854
854
`type Error = ErrorGuaranteed;
`
855
855
``
856
``
`-
fn interner(&self) -> TyCtxt<'tcx> {
`
``
856
`+
fn cx(&self) -> TyCtxt<'tcx> {
`
857
857
`self.tcx
`
858
858
`}
`
859
859
``
`@@ -2072,7 +2072,7 @@ struct ReplaceTy<'tcx> {
`
2072
2072
`}
`
2073
2073
``
2074
2074
`impl<'tcx> TypeFolder<TyCtxt<'tcx>> for ReplaceTy<'tcx> {
`
2075
``
`-
fn interner(&self) -> TyCtxt<'tcx> {
`
``
2075
`+
fn cx(&self) -> TyCtxt<'tcx> {
`
2076
2076
`self.tcx
`
2077
2077
`}
`
2078
2078
``