Skip to content

Commit 020c36e

Browse files
compiler-errorscompiler-errors
committed
Migrate item bounds to clause
1 parent c4309bd commit 020c36e

File tree

37 files changed

+220
-121
lines changed

37 files changed

+220
-121
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
704704
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) => tcx
705705
.explicit_item_bounds(def_id)
706706
.subst_iter_copied(tcx, substs)
707-
.find_map(find_fn_kind_from_did),
707+
.find_map(|(clause, span)| find_fn_kind_from_did((clause.as_predicate(), span))),
708708
ty::Closure(_, substs) => match substs.as_closure().kind() {
709709
ty::ClosureKind::Fn => Some(hir::Mutability::Not),
710710
ty::ClosureKind::FnMut => Some(hir::Mutability::Mut),

‎compiler/rustc_hir_analysis/src/bounds.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,8 @@ impl<'tcx> Bounds<'tcx> {
7878
pub fn predicates(&self) -> impl Iterator<Item = (Binder<'tcx, ty::Clause<'tcx>>, Span)> + '_ {
7979
self.predicates.iter().cloned()
8080
}
81+
82+
pub fn clauses(&self) -> impl Iterator<Item = (ty::Clause<'tcx>, Span)> + '_ {
83+
self.predicates.iter().cloned().map(|(pred, span)| (pred.as_clause().unwrap(), span))
84+
}
8185
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,7 @@ fn check_associated_type_bounds(wfcx: &WfCheckingCtxt<'_, '_>, item: ty::AssocIt
10861086
wfcx.infcx,
10871087
wfcx.param_env,
10881088
wfcx.body_def_id,
1089-
normalized_bound,
1089+
normalized_bound.as_predicate(),
10901090
bound_span,
10911091
)
10921092
});
@@ -1562,7 +1562,7 @@ impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for ImplTraitInTraitFinder<'_, 'tcx> {
15621562
self.wfcx.infcx,
15631563
self.wfcx.param_env,
15641564
self.wfcx.body_def_id,
1565-
bound,
1565+
bound.as_predicate(),
15661566
bound_span,
15671567
));
15681568
// Set the debruijn index back to innermost here, since we already eagerly

‎compiler/rustc_hir_analysis/src/collect/item_bounds.rs

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fn associated_type_bounds<'tcx>(
2020
assoc_item_def_id: LocalDefId,
2121
ast_bounds: &'tcx [hir::GenericBound<'tcx>],
2222
span: Span,
23-
) -> &'tcx [(ty::Predicate<'tcx>, Span)] {
23+
) -> &'tcx [(ty::Clause<'tcx>, Span)] {
2424
let item_ty = tcx.mk_projection(
2525
assoc_item_def_id.to_def_id(),
2626
InternalSubsts::identity_for_item(tcx, assoc_item_def_id),
@@ -34,8 +34,11 @@ fn associated_type_bounds<'tcx>(
3434
let trait_def_id = tcx.local_parent(assoc_item_def_id);
3535
let trait_predicates = tcx.trait_explicit_predicates_and_bounds(trait_def_id);
3636

37-
let bounds_from_parent = trait_predicates.predicates.iter().copied().filter(|(pred, _)| {
38-
match pred.kind().skip_binder() {
37+
let bounds_from_parent = trait_predicates
38+
.predicates
39+
.iter()
40+
.copied()
41+
.filter(|(pred, _)| match pred.kind().skip_binder() {
3942
ty::PredicateKind::Clause(ty::ClauseKind::Trait(tr)) => tr.self_ty() == item_ty,
4043
ty::PredicateKind::Clause(ty::ClauseKind::Projection(proj)) => {
4144
proj.projection_ty.self_ty() == item_ty
@@ -44,15 +47,10 @@ fn associated_type_bounds<'tcx>(
4447
outlives.0 == item_ty
4548
}
4649
_ => false,
47-
}
48-
});
50+
})
51+
.map(|(pred, span)| (pred.as_clause().unwrap(), span));
4952

50-
let all_bounds = tcx.arena.alloc_from_iter(
51-
bounds
52-
.predicates()
53-
.map(|(clause, span)| (clause.to_predicate(tcx), span))
54-
.chain(bounds_from_parent),
55-
);
53+
let all_bounds = tcx.arena.alloc_from_iter(bounds.clauses().chain(bounds_from_parent));
5654
debug!(
5755
"associated_type_bounds({}) = {:?}",
5856
tcx.def_path_str(assoc_item_def_id.to_def_id()),
@@ -72,24 +70,22 @@ fn opaque_type_bounds<'tcx>(
7270
ast_bounds: &'tcx [hir::GenericBound<'tcx>],
7371
item_ty: Ty<'tcx>,
7472
span: Span,
75-
) -> &'tcx [(ty::Predicate<'tcx>, Span)] {
73+
) -> &'tcx [(ty::Clause<'tcx>, Span)] {
7674
ty::print::with_no_queries!({
7775
let icx = ItemCtxt::new(tcx, opaque_def_id);
7876
let mut bounds = icx.astconv().compute_bounds(item_ty, ast_bounds, OnlySelfBounds(false));
7977
// Opaque types are implicitly sized unless a `?Sized` bound is found
8078
icx.astconv().add_implicitly_sized(&mut bounds, item_ty, ast_bounds, None, span);
8179
debug!(?bounds);
8280

83-
tcx.arena.alloc_from_iter(
84-
bounds.predicates().map(|(clause, span)| (clause.to_predicate(tcx), span)),
85-
)
81+
tcx.arena.alloc_from_iter(bounds.clauses())
8682
})
8783
}
8884

8985
pub(super) fn explicit_item_bounds(
9086
tcx: TyCtxt<'_>,
9187
def_id: LocalDefId,
92-
) -> ty::EarlyBinder<&'_ [(ty::Predicate<'_>, Span)]> {
88+
) -> ty::EarlyBinder<&'_ [(ty::Clause<'_>, Span)]> {
9389
match tcx.opt_rpitit_info(def_id.to_def_id()) {
9490
// RPITIT's bounds are the same as opaque type bounds, but with
9591
// a projection self type.
@@ -141,11 +137,8 @@ pub(super) fn explicit_item_bounds(
141137
pub(super) fn item_bounds(
142138
tcx: TyCtxt<'_>,
143139
def_id: DefId,
144-
) -> ty::EarlyBinder<&'_ ty::List<ty::Predicate<'_>>> {
140+
) -> ty::EarlyBinder<&'_ ty::List<ty::Clause<'_>>> {
145141
tcx.explicit_item_bounds(def_id).map_bound(|bounds| {
146-
tcx.mk_predicates_from_iter(util::elaborate(
147-
tcx,
148-
bounds.iter().map(|&(bound, _span)| bound),
149-
))
142+
tcx.mk_clauses_from_iter(util::elaborate(tcx, bounds.iter().map(|&(bound, _span)| bound)))
150143
})
151144
}

‎compiler/rustc_hir_analysis/src/variance/mod.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -162,28 +162,25 @@ fn variance_of_opaque(tcx: TyCtxt<'_>, item_def_id: LocalDefId) -> &[ty::Varianc
162162
// which thus mentions `'a` and should thus accept hidden types that borrow 'a
163163
// instead of requiring an additional `+ 'a`.
164164
match pred.kind().skip_binder() {
165-
ty::PredicateKind::Clause(ty::ClauseKind::Trait(ty::TraitPredicate {
165+
ty::ClauseKind::Trait(ty::TraitPredicate {
166166
trait_ref: ty::TraitRef { def_id: _, substs, .. },
167167
constness: _,
168168
polarity: _,
169-
})) => {
169+
}) => {
170170
for subst in &substs[1..] {
171171
subst.visit_with(&mut collector);
172172
}
173173
}
174-
ty::PredicateKind::Clause(ty::ClauseKind::Projection(ty::ProjectionPredicate {
174+
ty::ClauseKind::Projection(ty::ProjectionPredicate {
175175
projection_ty: ty::AliasTy { substs, .. },
176176
term,
177-
})) => {
177+
}) => {
178178
for subst in &substs[1..] {
179179
subst.visit_with(&mut collector);
180180
}
181181
term.visit_with(&mut collector);
182182
}
183-
ty::PredicateKind::Clause(ty::ClauseKind::TypeOutlives(ty::OutlivesPredicate(
184-
_,
185-
region,
186-
))) => {
183+
ty::ClauseKind::TypeOutlives(ty::OutlivesPredicate(_, region)) => {
187184
region.visit_with(&mut collector);
188185
}
189186
_ => {

‎compiler/rustc_hir_typeck/src/_match.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -536,33 +536,29 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
536536
}
537537

538538
for ty in [first_ty, second_ty] {
539-
for (pred, _) in self
539+
for (clause, _) in self
540540
.tcx
541541
.explicit_item_bounds(rpit_def_id)
542542
.subst_iter_copied(self.tcx, substs)
543543
{
544-
let pred = pred.kind().rebind(match pred.kind().skip_binder() {
545-
ty::PredicateKind::Clause(ty::ClauseKind::Trait(trait_pred)) => {
544+
let pred = clause.kind().rebind(match clause.kind().skip_binder() {
545+
ty::ClauseKind::Trait(trait_pred) => {
546546
// FIXME(rpitit): This will need to be fixed when we move to associated types
547547
assert!(matches!(
548548
*trait_pred.trait_ref.self_ty().kind(),
549549
ty::Alias(_, ty::AliasTy { def_id, substs: alias_substs, .. })
550550
if def_id == rpit_def_id && substs == alias_substs
551551
));
552-
ty::PredicateKind::Clause(ty::ClauseKind::Trait(
553-
trait_pred.with_self_ty(self.tcx, ty),
554-
))
552+
ty::ClauseKind::Trait(trait_pred.with_self_ty(self.tcx, ty))
555553
}
556-
ty::PredicateKind::Clause(ty::ClauseKind::Projection(
557-
mut proj_pred,
558-
)) => {
554+
ty::ClauseKind::Projection(mut proj_pred) => {
559555
assert!(matches!(
560556
*proj_pred.projection_ty.self_ty().kind(),
561557
ty::Alias(_, ty::AliasTy { def_id, substs: alias_substs, .. })
562558
if def_id == rpit_def_id && substs == alias_substs
563559
));
564560
proj_pred = proj_pred.with_self_ty(self.tcx, ty);
565-
ty::PredicateKind::Clause(ty::ClauseKind::Projection(proj_pred))
561+
ty::ClauseKind::Projection(proj_pred)
566562
}
567563
_ => continue,
568564
});

‎compiler/rustc_hir_typeck/src/closure.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
174174
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) => self
175175
.deduce_closure_signature_from_predicates(
176176
expected_ty,
177-
self.tcx.explicit_item_bounds(def_id).subst_iter_copied(self.tcx, substs),
177+
self.tcx
178+
.explicit_item_bounds(def_id)
179+
.subst_iter_copied(self.tcx, substs)
180+
.map(|(c, s)| (c.as_predicate(), s)),
178181
),
179182
ty::Dynamic(ref object_type, ..) => {
180183
let sig = object_type.projection_bounds().find_map(|pb| {
@@ -717,13 +720,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
717720
.tcx
718721
.explicit_item_bounds(def_id)
719722
.subst_iter_copied(self.tcx, substs)
720-
.find_map(|(p, s)| get_future_output(p, s))?,
723+
.find_map(|(p, s)| get_future_output(p.as_predicate(), s))?,
721724
ty::Error(_) => return None,
722725
ty::Alias(ty::Projection, proj) if self.tcx.is_impl_trait_in_trait(proj.def_id) => self
723726
.tcx
724727
.explicit_item_bounds(proj.def_id)
725728
.subst_iter_copied(self.tcx, proj.substs)
726-
.find_map(|(p, s)| get_future_output(p, s))?,
729+
.find_map(|(p, s)| get_future_output(p.as_predicate(), s))?,
727730
_ => span_bug!(
728731
self.tcx.def_span(expr_def_id),
729732
"async fn generator return type not an inference variable: {ret_ty}"

‎compiler/rustc_hir_typeck/src/generator_interior/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ fn check_must_not_suspend_ty<'tcx>(
577577
let mut has_emitted = false;
578578
for &(predicate, _) in fcx.tcx.explicit_item_bounds(def).skip_binder() {
579579
// We only look at the `DefId`, so it is safe to skip the binder here.
580-
if let ty::PredicateKind::Clause(ty::ClauseKind::Trait(ref poly_trait_predicate)) =
580+
if let ty::ClauseKind::Trait(ref poly_trait_predicate) =
581581
predicate.kind().skip_binder()
582582
{
583583
let def_id = poly_trait_predicate.trait_ref.def_id;

‎compiler/rustc_infer/src/infer/error_reporting/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,9 @@ impl<'tcx> InferCtxt<'tcx> {
408408
predicate
409409
.kind()
410410
.map_bound(|kind| match kind {
411-
ty::PredicateKind::Clause(ty::ClauseKind::Projection(
412-
projection_predicate,
413-
)) if projection_predicate.projection_ty.def_id == item_def_id => {
411+
ty::ClauseKind::Projection(projection_predicate)
412+
if projection_predicate.projection_ty.def_id == item_def_id =>
413+
{
414414
projection_predicate.term.ty()
415415
}
416416
_ => None,

‎compiler/rustc_infer/src/infer/opaque_types.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -647,9 +647,7 @@ impl<'tcx> InferCtxt<'tcx> {
647647
ct_op: |ct| ct,
648648
});
649649

650-
if let ty::PredicateKind::Clause(ty::ClauseKind::Projection(projection)) =
651-
predicate.kind().skip_binder()
652-
{
650+
if let ty::ClauseKind::Projection(projection) = predicate.kind().skip_binder() {
653651
if projection.term.references_error() {
654652
// No point on adding any obligations since there's a type error involved.
655653
obligations.clear();

0 commit comments

Comments
 (0)