Skip to content

Commit 051cab2

Browse files
borsbors
committed
Auto merge of rust-lang#104846 - spastorino:santa-clauses-make-goals-early-christmas-🎄, r=oli-obk
Branch Clause from Predicate r? `@oli-obk` This is part of what's proposed in rust-lang/compiler-team#531
2 parents e704e95 + 974e283 commit 051cab2

File tree

85 files changed

+625
-496
lines changed

Some content is hidden

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

85 files changed

+625
-496
lines changed

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

+16-12
Original file line numberDiff line numberDiff line change
@@ -666,15 +666,17 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
666666
let tcx = self.infcx.tcx;
667667

668668
// Find out if the predicates show that the type is a Fn or FnMut
669-
let find_fn_kind_from_did =
670-
|predicates: ty::EarlyBinder<&[(ty::Predicate<'tcx>, Span)]>, substs| {
671-
predicates.0.iter().find_map(|(pred, _)| {
669+
let find_fn_kind_from_did = |predicates: ty::EarlyBinder<
670+
&[(ty::Predicate<'tcx>, Span)],
671+
>,
672+
substs| {
673+
predicates.0.iter().find_map(|(pred, _)| {
672674
let pred = if let Some(substs) = substs {
673675
predicates.rebind(*pred).subst(tcx, substs).kind().skip_binder()
674676
} else {
675677
pred.kind().skip_binder()
676678
};
677-
if let ty::PredicateKind::Trait(pred) = pred && pred.self_ty() == ty {
679+
if let ty::PredicateKind::Clause(ty::Clause::Trait(pred)) = pred && pred.self_ty() == ty {
678680
if Some(pred.def_id()) == tcx.lang_items().fn_trait() {
679681
return Some(hir::Mutability::Not);
680682
} else if Some(pred.def_id()) == tcx.lang_items().fn_mut_trait() {
@@ -683,7 +685,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
683685
}
684686
None
685687
})
686-
};
688+
};
687689

688690
// If the type is opaque/param/closure, and it is Fn or FnMut, let's suggest (mutably)
689691
// borrowing the type, since `&mut F: FnMut` iff `F: FnMut` and similarly for `Fn`.
@@ -784,13 +786,15 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
784786
let predicates: Result<Vec<_>, _> = errors
785787
.into_iter()
786788
.map(|err| match err.obligation.predicate.kind().skip_binder() {
787-
PredicateKind::Trait(predicate) => match predicate.self_ty().kind() {
788-
ty::Param(param_ty) => Ok((
789-
generics.type_param(param_ty, tcx),
790-
predicate.trait_ref.print_only_trait_path().to_string(),
791-
)),
792-
_ => Err(()),
793-
},
789+
PredicateKind::Clause(ty::Clause::Trait(predicate)) => {
790+
match predicate.self_ty().kind() {
791+
ty::Param(param_ty) => Ok((
792+
generics.type_param(param_ty, tcx),
793+
predicate.trait_ref.print_only_trait_path().to_string(),
794+
)),
795+
_ => Err(()),
796+
}
797+
}
794798
_ => Err(()),
795799
})
796800
.collect();

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -959,8 +959,8 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
959959
{
960960
predicates.iter().any(|pred| {
961961
match pred.kind().skip_binder() {
962-
ty::PredicateKind::Trait(data) if data.self_ty() == ty => {}
963-
ty::PredicateKind::Projection(data) if data.projection_ty.self_ty() == ty => {}
962+
ty::PredicateKind::Clause(ty::Clause::Trait(data)) if data.self_ty() == ty => {}
963+
ty::PredicateKind::Clause(ty::Clause::Projection(data)) if data.projection_ty.self_ty() == ty => {}
964964
_ => return false,
965965
}
966966
tcx.any_free_region_meets(pred, |r| {

‎compiler/rustc_borrowck/src/type_check/canonical.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
8888
category: ConstraintCategory<'tcx>,
8989
) {
9090
self.prove_predicate(
91-
ty::Binder::dummy(ty::PredicateKind::Trait(ty::TraitPredicate {
91+
ty::Binder::dummy(ty::PredicateKind::Clause(ty::Clause::Trait(ty::TraitPredicate {
9292
trait_ref,
9393
constness: ty::BoundConstness::NotConst,
9494
polarity: ty::ImplPolarity::Positive,
95-
})),
95+
}))),
9696
locations,
9797
category,
9898
);

‎compiler/rustc_borrowck/src/type_check/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2013,8 +2013,8 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
20132013
);
20142014

20152015
let outlives_predicate =
2016-
tcx.mk_predicate(Binder::dummy(ty::PredicateKind::TypeOutlives(
2017-
ty::OutlivesPredicate(self_ty, *region),
2016+
tcx.mk_predicate(Binder::dummy(ty::PredicateKind::Clause(
2017+
ty::Clause::TypeOutlives(ty::OutlivesPredicate(self_ty, *region)),
20182018
)));
20192019
self.prove_predicate(
20202020
outlives_predicate,

‎compiler/rustc_const_eval/src/transform/check_consts/check.rs

+4-9
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc_middle::mir::visit::{MutatingUseContext, NonMutatingUseContext, PlaceC
1010
use rustc_middle::mir::*;
1111
use rustc_middle::ty::subst::{GenericArgKind, InternalSubsts};
1212
use rustc_middle::ty::{self, adjustment::PointerCast, Instance, InstanceDef, Ty, TyCtxt};
13-
use rustc_middle::ty::{Binder, TraitPredicate, TraitRef, TypeVisitable};
13+
use rustc_middle::ty::{Binder, TraitRef, TypeVisitable};
1414
use rustc_mir_dataflow::{self, Analysis};
1515
use rustc_span::{sym, Span, Symbol};
1616
use rustc_trait_selection::traits::error_reporting::TypeErrCtxtExt as _;
@@ -735,11 +735,8 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
735735
}
736736

737737
let trait_ref = TraitRef::from_method(tcx, trait_id, substs);
738-
let poly_trait_pred = Binder::dummy(TraitPredicate {
739-
trait_ref,
740-
constness: ty::BoundConstness::ConstIfConst,
741-
polarity: ty::ImplPolarity::Positive,
742-
});
738+
let poly_trait_pred =
739+
Binder::dummy(trait_ref).with_constness(ty::BoundConstness::ConstIfConst);
743740
let obligation =
744741
Obligation::new(tcx, ObligationCause::dummy(), param_env, poly_trait_pred);
745742

@@ -828,9 +825,7 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
828825
tcx,
829826
ObligationCause::dummy_with_span(*fn_span),
830827
param_env,
831-
tcx.mk_predicate(
832-
poly_trait_pred.map_bound(ty::PredicateKind::Trait),
833-
),
828+
poly_trait_pred,
834829
);
835830

836831
// improve diagnostics by showing what failed. Our requirements are stricter this time

‎compiler/rustc_const_eval/src/transform/check_consts/ops.rs

+3-8
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ use rustc_middle::mir;
1313
use rustc_middle::ty::print::with_no_trimmed_paths;
1414
use rustc_middle::ty::subst::{GenericArgKind, SubstsRef};
1515
use rustc_middle::ty::{
16-
suggest_constraining_type_param, Adt, Closure, DefIdTree, FnDef, FnPtr, Param, TraitPredicate,
17-
Ty,
16+
suggest_constraining_type_param, Adt, Closure, DefIdTree, FnDef, FnPtr, Param, Ty,
1817
};
19-
use rustc_middle::ty::{Binder, BoundConstness, ImplPolarity, TraitRef};
18+
use rustc_middle::ty::{Binder, TraitRef};
2019
use rustc_session::parse::feature_err;
2120
use rustc_span::symbol::sym;
2221
use rustc_span::{BytePos, Pos, Span, Symbol};
@@ -150,11 +149,7 @@ impl<'tcx> NonConstOp<'tcx> for FnCallNonConst<'tcx> {
150149
tcx,
151150
ObligationCause::dummy(),
152151
param_env,
153-
Binder::dummy(TraitPredicate {
154-
trait_ref,
155-
constness: BoundConstness::NotConst,
156-
polarity: ImplPolarity::Positive,
157-
}),
152+
Binder::dummy(trait_ref),
158153
);
159154

160155
let infcx = tcx.infer_ctxt().build();

‎compiler/rustc_const_eval/src/transform/check_consts/qualifs.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,8 @@ impl Qualif for NeedsNonConstDrop {
157157
cx.tcx,
158158
ObligationCause::dummy_with_span(cx.body.span),
159159
cx.param_env,
160-
ty::Binder::dummy(ty::TraitPredicate {
161-
trait_ref: cx.tcx.at(cx.body.span).mk_trait_ref(LangItem::Destruct, [ty]),
162-
constness: ty::BoundConstness::ConstIfConst,
163-
polarity: ty::ImplPolarity::Positive,
164-
}),
160+
ty::Binder::dummy(cx.tcx.at(cx.body.span).mk_trait_ref(LangItem::Destruct, [ty]))
161+
.with_constness(ty::BoundConstness::ConstIfConst),
165162
);
166163

167164
let infcx = cx.tcx.infer_ctxt().build();

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1378,7 +1378,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
13781378

13791379
let bound_predicate = obligation.predicate.kind();
13801380
match bound_predicate.skip_binder() {
1381-
ty::PredicateKind::Trait(pred) => {
1381+
ty::PredicateKind::Clause(ty::Clause::Trait(pred)) => {
13821382
let pred = bound_predicate.rebind(pred);
13831383
associated_types.entry(span).or_default().extend(
13841384
tcx.associated_items(pred.def_id())
@@ -1387,7 +1387,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
13871387
.map(|item| item.def_id),
13881388
);
13891389
}
1390-
ty::PredicateKind::Projection(pred) => {
1390+
ty::PredicateKind::Clause(ty::Clause::Projection(pred)) => {
13911391
let pred = bound_predicate.rebind(pred);
13921392
// A `Self` within the original bound will be substituted with a
13931393
// `trait_object_dummy_self`, so check for that.

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

+16-8
Original file line numberDiff line numberDiff line change
@@ -183,19 +183,27 @@ fn ensure_drop_predicates_are_implied_by_item_defn<'tcx>(
183183
let predicate = predicate.kind();
184184
let p = p.kind();
185185
match (predicate.skip_binder(), p.skip_binder()) {
186-
(ty::PredicateKind::Trait(a), ty::PredicateKind::Trait(b)) => {
187-
relator.relate(predicate.rebind(a), p.rebind(b)).is_ok()
188-
}
189-
(ty::PredicateKind::Projection(a), ty::PredicateKind::Projection(b)) => {
190-
relator.relate(predicate.rebind(a), p.rebind(b)).is_ok()
191-
}
186+
(
187+
ty::PredicateKind::Clause(ty::Clause::Trait(a)),
188+
ty::PredicateKind::Clause(ty::Clause::Trait(b)),
189+
) => relator.relate(predicate.rebind(a), p.rebind(b)).is_ok(),
190+
(
191+
ty::PredicateKind::Clause(ty::Clause::Projection(a)),
192+
ty::PredicateKind::Clause(ty::Clause::Projection(b)),
193+
) => relator.relate(predicate.rebind(a), p.rebind(b)).is_ok(),
192194
(
193195
ty::PredicateKind::ConstEvaluatable(a),
194196
ty::PredicateKind::ConstEvaluatable(b),
195197
) => relator.relate(predicate.rebind(a), predicate.rebind(b)).is_ok(),
196198
(
197-
ty::PredicateKind::TypeOutlives(ty::OutlivesPredicate(ty_a, lt_a)),
198-
ty::PredicateKind::TypeOutlives(ty::OutlivesPredicate(ty_b, lt_b)),
199+
ty::PredicateKind::Clause(ty::Clause::TypeOutlives(ty::OutlivesPredicate(
200+
ty_a,
201+
lt_a,
202+
))),
203+
ty::PredicateKind::Clause(ty::Clause::TypeOutlives(ty::OutlivesPredicate(
204+
ty_b,
205+
lt_b,
206+
))),
199207
) => {
200208
relator.relate(predicate.rebind(ty_a), p.rebind(ty_b)).is_ok()
201209
&& relator.relate(predicate.rebind(lt_a), p.rebind(lt_b)).is_ok()

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ fn bounds_from_generic_predicates<'tcx>(
309309
debug!("predicate {:?}", predicate);
310310
let bound_predicate = predicate.kind();
311311
match bound_predicate.skip_binder() {
312-
ty::PredicateKind::Trait(trait_predicate) => {
312+
ty::PredicateKind::Clause(ty::Clause::Trait(trait_predicate)) => {
313313
let entry = types.entry(trait_predicate.self_ty()).or_default();
314314
let def_id = trait_predicate.def_id();
315315
if Some(def_id) != tcx.lang_items().sized_trait() {
@@ -318,7 +318,7 @@ fn bounds_from_generic_predicates<'tcx>(
318318
entry.push(trait_predicate.def_id());
319319
}
320320
}
321-
ty::PredicateKind::Projection(projection_pred) => {
321+
ty::PredicateKind::Clause(ty::Clause::Projection(projection_pred)) => {
322322
projections.push(bound_predicate.rebind(projection_pred));
323323
}
324324
_ => {}

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

+14-10
Original file line numberDiff line numberDiff line change
@@ -462,12 +462,16 @@ fn check_gat_where_clauses(tcx: TyCtxt<'_>, associated_items: &[hir::TraitItemRe
462462
let mut unsatisfied_bounds: Vec<_> = required_bounds
463463
.into_iter()
464464
.filter(|clause| match clause.kind().skip_binder() {
465-
ty::PredicateKind::RegionOutlives(ty::OutlivesPredicate(a, b)) => {
465+
ty::PredicateKind::Clause(ty::Clause::RegionOutlives(ty::OutlivesPredicate(
466+
a,
467+
b,
468+
))) => {
466469
!region_known_to_outlive(tcx, gat_hir, param_env, &FxIndexSet::default(), a, b)
467470
}
468-
ty::PredicateKind::TypeOutlives(ty::OutlivesPredicate(a, b)) => {
469-
!ty_known_to_outlive(tcx, gat_hir, param_env, &FxIndexSet::default(), a, b)
470-
}
471+
ty::PredicateKind::Clause(ty::Clause::TypeOutlives(ty::OutlivesPredicate(
472+
a,
473+
b,
474+
))) => !ty_known_to_outlive(tcx, gat_hir, param_env, &FxIndexSet::default(), a, b),
471475
_ => bug!("Unexpected PredicateKind"),
472476
})
473477
.map(|clause| clause.to_string())
@@ -599,8 +603,9 @@ fn gather_gat_bounds<'tcx, T: TypeFoldable<'tcx>>(
599603
}));
600604
// The predicate we expect to see. (In our example,
601605
// `Self: 'me`.)
602-
let clause =
603-
ty::PredicateKind::TypeOutlives(ty::OutlivesPredicate(ty_param, region_param));
606+
let clause = ty::PredicateKind::Clause(ty::Clause::TypeOutlives(
607+
ty::OutlivesPredicate(ty_param, region_param),
608+
));
604609
let clause = tcx.mk_predicate(ty::Binder::dummy(clause));
605610
bounds.insert(clause);
606611
}
@@ -636,9 +641,8 @@ fn gather_gat_bounds<'tcx, T: TypeFoldable<'tcx>>(
636641
name: region_b_param.name,
637642
}));
638643
// The predicate we expect to see.
639-
let clause = ty::PredicateKind::RegionOutlives(ty::OutlivesPredicate(
640-
region_a_param,
641-
region_b_param,
644+
let clause = ty::PredicateKind::Clause(ty::Clause::RegionOutlives(
645+
ty::OutlivesPredicate(region_a_param, region_b_param),
642646
));
643647
let clause = tcx.mk_predicate(ty::Binder::dummy(clause));
644648
bounds.insert(clause);
@@ -1784,7 +1788,7 @@ fn receiver_is_implemented<'tcx>(
17841788
let tcx = wfcx.tcx();
17851789
let trait_ref = ty::Binder::dummy(tcx.mk_trait_ref(receiver_trait_def_id, [receiver_ty]));
17861790

1787-
let obligation = traits::Obligation::new(tcx, cause, wfcx.param_env, trait_ref.without_const());
1791+
let obligation = traits::Obligation::new(tcx, cause, wfcx.param_env, trait_ref);
17881792

17891793
if wfcx.infcx.predicate_must_hold_modulo_regions(&obligation) {
17901794
true

‎compiler/rustc_hir_analysis/src/coherence/builtin.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,11 @@ fn visit_implementation_of_copy(tcx: TyCtxt<'_>, impl_did: LocalDefId) {
128128
.or_default()
129129
.push(error.obligation.cause.span);
130130
}
131-
if let ty::PredicateKind::Trait(ty::TraitPredicate {
131+
if let ty::PredicateKind::Clause(ty::Clause::Trait(ty::TraitPredicate {
132132
trait_ref,
133133
polarity: ty::ImplPolarity::Positive,
134134
..
135-
}) = error_predicate.kind().skip_binder()
135+
})) = error_predicate.kind().skip_binder()
136136
{
137137
let ty = trait_ref.self_ty();
138138
if let ty::Param(_) = ty.kind() {

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@ fn associated_type_bounds<'tcx>(
3535

3636
let bounds_from_parent = trait_predicates.predicates.iter().copied().filter(|(pred, _)| {
3737
match pred.kind().skip_binder() {
38-
ty::PredicateKind::Trait(tr) => tr.self_ty() == item_ty,
39-
ty::PredicateKind::Projection(proj) => proj.projection_ty.self_ty() == item_ty,
40-
ty::PredicateKind::TypeOutlives(outlives) => outlives.0 == item_ty,
38+
ty::PredicateKind::Clause(ty::Clause::Trait(tr)) => tr.self_ty() == item_ty,
39+
ty::PredicateKind::Clause(ty::Clause::Projection(proj)) => {
40+
proj.projection_ty.self_ty() == item_ty
41+
}
42+
ty::PredicateKind::Clause(ty::Clause::TypeOutlives(outlives)) => outlives.0 == item_ty,
4143
_ => false,
4244
}
4345
});

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1558,7 +1558,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
15581558
let obligations = predicates.predicates.iter().filter_map(|&(pred, _)| {
15591559
let bound_predicate = pred.kind();
15601560
match bound_predicate.skip_binder() {
1561-
ty::PredicateKind::Trait(data) => {
1561+
ty::PredicateKind::Clause(ty::Clause::Trait(data)) => {
15621562
// The order here needs to match what we would get from `subst_supertrait`
15631563
let pred_bound_vars = bound_predicate.bound_vars();
15641564
let mut all_bound_vars = bound_vars.clone();

0 commit comments

Comments
 (0)