rename ReLateBound to ReBound

other changes: - `Region::new_late_bound` -> `Region::new_bound` - `Region::is_late_bound` -> `Region::is_bound`

Author: lcnr

compiler/rustc_borrowck/src/diagnostics/mod.rs

@@ -462,7 +462,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
  // lifetimes without names with the value `'0`.
  if let ty::Ref(region, ..) = ty.kind() {
  match **region {
- ty::ReLateBound(_, ty::BoundRegion { kind: br, .. })
+ ty::ReBound(_, ty::BoundRegion { kind: br, .. })
  | ty::RePlaceholder(ty::PlaceholderRegion {
  bound: ty::BoundRegion { kind: br, .. },
  ..
@@ -482,7 +482,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 
  let region = if let ty::Ref(region, ..) = ty.kind() {
  match **region {
- ty::ReLateBound(_, ty::BoundRegion { kind: br, .. })
+ ty::ReBound(_, ty::BoundRegion { kind: br, .. })
  | ty::RePlaceholder(ty::PlaceholderRegion {
  bound: ty::BoundRegion { kind: br, .. },
  ..

compiler/rustc_borrowck/src/diagnostics/region_name.rs

@@ -357,7 +357,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
  ty::BoundRegionKind::BrAnon => None,
  },
 
- ty::ReLateBound(..)
+ ty::ReBound(..)
  | ty::ReVar(..)
  | ty::RePlaceholder(..)
  | ty::ReErased

compiler/rustc_borrowck/src/universal_regions.rs

@@ -665,7 +665,7 @@ impl<'cx, 'tcx> UniversalRegionsBuilder<'cx, 'tcx> {
  var: ty::BoundVar::from_usize(bound_vars.len() - 1),
  kind: ty::BrEnv,
  };
- let env_region = ty::Region::new_late_bound(tcx, ty::INNERMOST, br);
+ let env_region = ty::Region::new_bound(tcx, ty::INNERMOST, br);
  let closure_ty = tcx.closure_env_ty(def_id, args, env_region).unwrap();
 
  // The "inputs" of the closure in the

compiler/rustc_hir_analysis/src/astconv/bounds.rs

@@ -350,7 +350,7 @@ impl<'tcx> dyn AstConv<'tcx> + '_ {
  let args =
  candidate.skip_binder().args.extend_to(tcx, assoc_item.def_id, |param, _| {
  let subst = match param.kind {
- ty::GenericParamDefKind::Lifetime => ty::Region::new_late_bound(
+ ty::GenericParamDefKind::Lifetime => ty::Region::new_bound(
  tcx,
  ty::INNERMOST,
  ty::BoundRegion {

compiler/rustc_hir_analysis/src/astconv/mod.rs

@@ -250,7 +250,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
  var: ty::BoundVar::from_u32(index),
  kind: ty::BrNamed(def_id, name),
  };
- ty::Region::new_late_bound(tcx, debruijn, br)
+ ty::Region::new_bound(tcx, debruijn, br)
  }
 
  Some(rbv::ResolvedArg::EarlyBound(def_id)) => {
@@ -1622,7 +1622,9 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
  }
 
  fn fold_region(&mut self, r: ty::Region<'tcx>) -> ty::Region<'tcx> {
- if r.is_late_bound() { self.tcx.lifetimes.re_erased } else { r }
+ // FIXME(@lcnr): This is broken, erasing bound regions
+ // impacts selection as it results in different types.
+ if r.is_bound() { self.tcx.lifetimes.re_erased } else { r }
  }
 
  fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {

compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

@@ -2345,7 +2345,7 @@ fn param_env_with_gat_bounds<'tcx>(
  let kind = ty::BoundRegionKind::BrNamed(param.def_id, param.name);
  let bound_var = ty::BoundVariableKind::Region(kind);
  bound_vars.push(bound_var);
- ty::Region::new_late_bound(
+ ty::Region::new_bound(
  tcx,
  ty::INNERMOST,
  ty::BoundRegion {

compiler/rustc_hir_analysis/src/check/intrinsic.rs

@@ -143,12 +143,12 @@ pub fn check_intrinsic_type(tcx: TyCtxt<'_>, it: &hir::ForeignItem<'_>) {
  ]);
  let mk_va_list_ty = |mutbl| {
  tcx.lang_items().va_list().map(|did| {
- let region = ty::Region::new_late_bound(
+ let region = ty::Region::new_bound(
  tcx,
  ty::INNERMOST,
  ty::BoundRegion { var: ty::BoundVar::from_u32(0), kind: ty::BrAnon },
  );
- let env_region = ty::Region::new_late_bound(
+ let env_region = ty::Region::new_bound(
  tcx,
  ty::INNERMOST,
  ty::BoundRegion { var: ty::BoundVar::from_u32(1), kind: ty::BrEnv },
@@ -411,7 +411,7 @@ pub fn check_intrinsic_type(tcx: TyCtxt<'_>, it: &hir::ForeignItem<'_>) {
  1,
  vec![Ty::new_imm_ref(
  tcx,
- ty::Region::new_late_bound(tcx, ty::INNERMOST, br),
+ ty::Region::new_bound(tcx, ty::INNERMOST, br),
  param(0),
  )],
  Ty::new_projection(tcx, discriminant_def_id, tcx.mk_args(&[param(0).into()])),
@@ -465,11 +465,8 @@ pub fn check_intrinsic_type(tcx: TyCtxt<'_>, it: &hir::ForeignItem<'_>) {
 
  sym::raw_eq => {
  let br = ty::BoundRegion { var: ty::BoundVar::from_u32(0), kind: ty::BrAnon };
- let param_ty = Ty::new_imm_ref(
- tcx,
- ty::Region::new_late_bound(tcx, ty::INNERMOST, br),
- param(0),
- );
+ let param_ty =
+ Ty::new_imm_ref(tcx, ty::Region::new_bound(tcx, ty::INNERMOST, br), param(0));
  (1, vec![param_ty; 2], tcx.types.bool)
  }
 

compiler/rustc_hir_analysis/src/check/wfcheck.rs

@@ -763,7 +763,7 @@ impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for GATSubstCollector<'tcx> {
  ty::Alias(ty::Projection, p) if p.def_id == self.gat => {
  for (idx, subst) in p.args.iter().enumerate() {
  match subst.unpack() {
- GenericArgKind::Lifetime(lt) if !lt.is_late_bound() => {
+ GenericArgKind::Lifetime(lt) if !lt.is_bound() => {
  self.regions.insert((lt, idx));
  }
  GenericArgKind::Type(t) => {

compiler/rustc_hir_analysis/src/hir_wf_check.rs

@@ -196,6 +196,7 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for EraseAllBoundRegions<'tcx> {
  self.tcx
  }
  fn fold_region(&mut self, r: Region<'tcx>) -> Region<'tcx> {
- if r.is_late_bound() { self.tcx.lifetimes.re_erased } else { r }
+ // FIXME(@lcnr): only erase escaping bound regions!
+ if r.is_bound() { self.tcx.lifetimes.re_erased } else { r }
  }
 }

compiler/rustc_hir_analysis/src/outlives/utils.rs

@@ -167,8 +167,8 @@ fn is_free_region(region: Region<'_>) -> bool {
  // }
  //
  // The type above might generate a `T: 'b` bound, but we can
- // ignore it. We can't put it on the struct header anyway.
- ty::ReLateBound(..) => false,
+ // ignore it. We can't name this lifetime pn the struct header anyway.
+ ty::ReBound(..) => false,
 
  ty::ReError(_) => false,