update type flags

- `HAS_RE_LATE_BOUND` -> `HAS_RE_BOUND`
- `HAS_TY_LATE_BOUND` -> `HAS_TY_BOUND`
- `HAS_CT_LATE_BOUND` -> `HAS_CT_BOUND`
- `HAS_LATE_BOUND` -> `HAS_BOUND_VARS`
- `fn has_late_bound_regions` -> `fn has_bound_regions`
- `fnhas_non_region_late_bound` -> `fn has_non_region_bound_vars`
- `fn has_late_bound_vars` -> `fn has_bound_vars`
This commit is contained in:
lcnr 2023-11-13 14:12:56 +00:00
parent c4971f9f65
commit 9ab054d714
2 changed files with 3 additions and 3 deletions

View File

@ -290,7 +290,7 @@ fn check_ty(from_ty: Ty<'_>, to_ty: Ty<'_>) -> bool {
.zip(to_tys) .zip(to_tys)
.any(|(from_ty, to_ty)| check_ty(from_ty, to_ty)) .any(|(from_ty, to_ty)| check_ty(from_ty, to_ty))
}, },
_ => from_ty.has_late_bound_regions(), _ => from_ty.has_bound_regions(),
} }
} }

View File

@ -1160,7 +1160,7 @@ pub fn make_normalized_projection<'tcx>(
) -> Option<Ty<'tcx>> { ) -> Option<Ty<'tcx>> {
fn helper<'tcx>(tcx: TyCtxt<'tcx>, param_env: ParamEnv<'tcx>, ty: AliasTy<'tcx>) -> Option<Ty<'tcx>> { fn helper<'tcx>(tcx: TyCtxt<'tcx>, param_env: ParamEnv<'tcx>, ty: AliasTy<'tcx>) -> Option<Ty<'tcx>> {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
if let Some((i, arg)) = ty.args.iter().enumerate().find(|(_, arg)| arg.has_late_bound_regions()) { if let Some((i, arg)) = ty.args.iter().enumerate().find(|(_, arg)| arg.has_bound_regions()) {
debug_assert!( debug_assert!(
false, false,
"args contain late-bound region at index `{i}` which can't be normalized.\n\ "args contain late-bound region at index `{i}` which can't be normalized.\n\
@ -1233,7 +1233,7 @@ pub fn make_normalized_projection_with_regions<'tcx>(
) -> Option<Ty<'tcx>> { ) -> Option<Ty<'tcx>> {
fn helper<'tcx>(tcx: TyCtxt<'tcx>, param_env: ParamEnv<'tcx>, ty: AliasTy<'tcx>) -> Option<Ty<'tcx>> { fn helper<'tcx>(tcx: TyCtxt<'tcx>, param_env: ParamEnv<'tcx>, ty: AliasTy<'tcx>) -> Option<Ty<'tcx>> {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
if let Some((i, arg)) = ty.args.iter().enumerate().find(|(_, arg)| arg.has_late_bound_regions()) { if let Some((i, arg)) = ty.args.iter().enumerate().find(|(_, arg)| arg.has_bound_regions()) {
debug_assert!( debug_assert!(
false, false,
"args contain late-bound region at index `{i}` which can't be normalized.\n\ "args contain late-bound region at index `{i}` which can't be normalized.\n\