w

Author: lcnr

compiler/rustc_borrowck/src/universal_regions.rs

@@ -843,8 +843,9 @@ impl<'tcx> BorrowckInferCtxt<'tcx> {
     {
         let (value, _map) = self.tcx.instantiate_bound_regions(value, |br| {
             debug!(?br);
+            let kind = ty::LateParamRegionKind::from_bound(br.var, br.kind);
             let liberated_region =
-                ty::Region::new_late_param_from_bound(self.tcx, all_outlive_scope.to_def_id(), br);
+                ty::Region::new_late_param(self.tcx, all_outlive_scope.to_def_id(), kind);
             let region_vid = {
                 let name = match br.kind.get_name() {
                     Some(name) => name,

compiler/rustc_middle/src/ty/fold.rs

@@ -270,7 +270,8 @@ impl<'tcx> TyCtxt<'tcx> {
         T: TypeFoldable<TyCtxt<'tcx>>,
     {
         self.instantiate_bound_regions_uncached(value, |br| {
-            ty::Region::new_late_param_from_bound(self, all_outlive_scope, br)
+            let kind = ty::LateParamRegionKind::from_bound(br.var, br.kind);
+            ty::Region::new_late_param(self, all_outlive_scope, kind)
         })
     }
 

compiler/rustc_middle/src/ty/region.rs

@@ -76,17 +76,6 @@ impl<'tcx> Region<'tcx> {
         tcx.intern_region(ty::ReLateParam(data))
     }
 
-    #[inline]
-    pub fn new_late_param_from_bound(
-        tcx: TyCtxt<'tcx>,
-        scope: DefId,
-        bound: BoundRegion,
-    ) -> Region<'tcx> {
-        let data =
-            LateParamRegion { scope, kind: LateParamRegionKind::from_bound(bound.var, bound.kind) };
-        tcx.intern_region(ty::ReLateParam(data))
-    }
-
     #[inline]
     pub fn new_var(tcx: TyCtxt<'tcx>, v: ty::RegionVid) -> Region<'tcx> {
         // Use a pre-interned one when possible.