Skip to content

Commit 3458211

Browse files
committedMay 13, 2024
Auto merge of #125076 - compiler-errors:alias-term, r=lcnr
Split out `ty::AliasTerm` from `ty::AliasTy` Splitting out `AliasTerm` (for use in project and normalizes goals) and `AliasTy` (for use in `ty::Alias`) r? lcnr
2 parents ab14f94 + fa84018 commit 3458211

File tree

73 files changed

+695
-458
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+695
-458
lines changed
 

‎compiler/rustc_borrowck/src/diagnostics/region_name.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,8 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
10101010
clauses.iter().any(|pred| {
10111011
match pred.kind().skip_binder() {
10121012
ty::ClauseKind::Trait(data) if data.self_ty() == ty => {}
1013-
ty::ClauseKind::Projection(data) if data.projection_ty.self_ty() == ty => {}
1013+
ty::ClauseKind::Projection(data)
1014+
if data.projection_term.self_ty() == ty => {}
10141015
_ => return false,
10151016
}
10161017
tcx.any_free_region_meets(pred, |r| *r == ty::ReEarlyParam(region))

‎compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2206,7 +2206,7 @@ fn param_env_with_gat_bounds<'tcx>(
22062206
_ => predicates.push(
22072207
ty::Binder::bind_with_vars(
22082208
ty::ProjectionPredicate {
2209-
projection_ty: ty::AliasTy::new(tcx, trait_ty.def_id, rebased_args),
2209+
projection_term: ty::AliasTerm::new(tcx, trait_ty.def_id, rebased_args),
22102210
term: normalize_impl_ty.into(),
22112211
},
22122212
bound_vars,

0 commit comments

Comments
 (0)