Skip to content

Commit 716c552

Browse files
compiler-errorscompiler-errors
committed
Migrate predicates_of and caller_bounds to Clause
1 parent a9e0bbb commit 716c552

File tree

9 files changed

+30
-59
lines changed

9 files changed

+30
-59
lines changed

‎clippy_lints/src/dereference.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use rustc_middle::mir::{Rvalue, StatementKind};
2727
use rustc_middle::ty::adjustment::{Adjust, Adjustment, AutoBorrow, AutoBorrowMutability};
2828
use rustc_middle::ty::{
2929
self, Binder, BoundVariableKind, ClauseKind, EarlyBinder, FnSig, GenericArgKind, List, ParamEnv, ParamTy,
30-
PredicateKind, ProjectionPredicate, Ty, TyCtxt, TypeVisitableExt, TypeckResults,
30+
ProjectionPredicate, Ty, TyCtxt, TypeVisitableExt, TypeckResults,
3131
};
3232
use rustc_session::{declare_tool_lint, impl_lint_pass};
3333
use rustc_span::{symbol::sym, Span, Symbol};
@@ -1133,7 +1133,7 @@ fn needless_borrow_impl_arg_position<'tcx>(
11331133
let projection_predicates = predicates
11341134
.iter()
11351135
.filter_map(|predicate| {
1136-
if let PredicateKind::Clause(ClauseKind::Projection(projection_predicate)) = predicate.kind().skip_binder() {
1136+
if let ClauseKind::Projection(projection_predicate) = predicate.kind().skip_binder() {
11371137
Some(projection_predicate)
11381138
} else {
11391139
None
@@ -1147,7 +1147,7 @@ fn needless_borrow_impl_arg_position<'tcx>(
11471147
if predicates
11481148
.iter()
11491149
.filter_map(|predicate| {
1150-
if let PredicateKind::Clause(ClauseKind::Trait(trait_predicate)) = predicate.kind().skip_binder()
1150+
if let ClauseKind::Trait(trait_predicate) = predicate.kind().skip_binder()
11511151
&& trait_predicate.trait_ref.self_ty() == param_ty.to_ty(cx.tcx)
11521152
{
11531153
Some(trait_predicate.trait_ref.def_id)
@@ -1209,7 +1209,7 @@ fn needless_borrow_impl_arg_position<'tcx>(
12091209
}
12101210

12111211
predicates.iter().all(|predicate| {
1212-
if let PredicateKind::Clause(ClauseKind::Trait(trait_predicate)) = predicate.kind().skip_binder()
1212+
if let ClauseKind::Trait(trait_predicate) = predicate.kind().skip_binder()
12131213
&& cx.tcx.is_diagnostic_item(sym::IntoIterator, trait_predicate.trait_ref.def_id)
12141214
&& let ty::Param(param_ty) = trait_predicate.self_ty().kind()
12151215
&& let GenericArgKind::Type(ty) = substs_with_referent_ty[param_ty.index as usize].unpack()

‎clippy_lints/src/derive.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ use rustc_lint::{LateContext, LateLintPass};
1414
use rustc_middle::hir::nested_filter;
1515
use rustc_middle::traits::Reveal;
1616
use rustc_middle::ty::{
17-
self, Binder, BoundConstness, ClauseKind, GenericArgKind, GenericParamDefKind, ImplPolarity, ParamEnv, PredicateKind,
18-
TraitPredicate, Ty, TyCtxt,
17+
self, BoundConstness, ClauseKind, GenericArgKind, GenericParamDefKind, ImplPolarity, ParamEnv,
18+
ToPredicate, TraitPredicate, Ty, TyCtxt,
1919
};
2020
use rustc_session::{declare_lint_pass, declare_tool_lint};
2121
use rustc_span::def_id::LocalDefId;
@@ -503,7 +503,7 @@ fn param_env_for_derived_eq(tcx: TyCtxt<'_>, did: DefId, eq_trait_id: DefId) ->
503503

504504
let ty_predicates = tcx.predicates_of(did).predicates;
505505
for (p, _) in ty_predicates {
506-
if let PredicateKind::Clause(ClauseKind::Trait(p)) = p.kind().skip_binder()
506+
if let ClauseKind::Trait(p) = p.kind().skip_binder()
507507
&& p.trait_ref.def_id == eq_trait_id
508508
&& let ty::Param(self_ty) = p.trait_ref.self_ty().kind()
509509
&& p.constness == BoundConstness::NotConst
@@ -514,13 +514,13 @@ fn param_env_for_derived_eq(tcx: TyCtxt<'_>, did: DefId, eq_trait_id: DefId) ->
514514
}
515515

516516
ParamEnv::new(
517-
tcx.mk_predicates_from_iter(ty_predicates.iter().map(|&(p, _)| p).chain(
517+
tcx.mk_clauses_from_iter(ty_predicates.iter().map(|&(p, _)| p).chain(
518518
params.iter().filter(|&&(_, needs_eq)| needs_eq).map(|&(param, _)| {
519-
tcx.mk_predicate(Binder::dummy(PredicateKind::Clause(ClauseKind::Trait(TraitPredicate {
519+
ClauseKind::Trait(TraitPredicate {
520520
trait_ref: ty::TraitRef::new(tcx, eq_trait_id, [tcx.mk_param_from_def(param)]),
521521
constness: BoundConstness::NotConst,
522522
polarity: ImplPolarity::Positive,
523-
}))))
523+
}).to_predicate(tcx)
524524
}),
525525
)),
526526
Reveal::UserFacing,

‎clippy_lints/src/methods/needless_collect.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use rustc_hir::{
1616
};
1717
use rustc_lint::LateContext;
1818
use rustc_middle::hir::nested_filter;
19-
use rustc_middle::ty::{self, AssocKind, ClauseKind, EarlyBinder, GenericArg, GenericArgKind, PredicateKind, Ty};
19+
use rustc_middle::ty::{self, AssocKind, ClauseKind, EarlyBinder, GenericArg, GenericArgKind, Ty};
2020
use rustc_span::symbol::Ident;
2121
use rustc_span::{sym, Span, Symbol};
2222

@@ -175,7 +175,7 @@ fn check_collect_into_intoiterator<'tcx>(
175175
.caller_bounds()
176176
.into_iter()
177177
.filter_map(|p| {
178-
if let PredicateKind::Clause(ClauseKind::Trait(t)) = p.kind().skip_binder()
178+
if let ClauseKind::Trait(t) = p.kind().skip_binder()
179179
&& cx.tcx.is_diagnostic_item(sym::IntoIterator,t.trait_ref.def_id) {
180180
Some(t.self_ty())
181181
} else {

‎clippy_lints/src/methods/unnecessary_to_owned.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use rustc_lint::LateContext;
1414
use rustc_middle::mir::Mutability;
1515
use rustc_middle::ty::adjustment::{Adjust, Adjustment, OverloadedDeref};
1616
use rustc_middle::ty::subst::{GenericArg, GenericArgKind, SubstsRef};
17-
use rustc_middle::ty::{self, ClauseKind, EarlyBinder, ParamTy, PredicateKind, ProjectionPredicate, TraitPredicate, Ty};
17+
use rustc_middle::ty::{self, ClauseKind, EarlyBinder, ParamTy, ProjectionPredicate, TraitPredicate, Ty};
1818
use rustc_span::{sym, Symbol};
1919
use rustc_trait_selection::traits::{query::evaluate_obligation::InferCtxtExt as _, Obligation, ObligationCause};
2020

@@ -345,12 +345,12 @@ fn get_input_traits_and_projections<'tcx>(
345345
let mut projection_predicates = Vec::new();
346346
for predicate in cx.tcx.param_env(callee_def_id).caller_bounds() {
347347
match predicate.kind().skip_binder() {
348-
PredicateKind::Clause(ClauseKind::Trait(trait_predicate)) => {
348+
ClauseKind::Trait(trait_predicate) => {
349349
if trait_predicate.trait_ref.self_ty() == input {
350350
trait_predicates.push(trait_predicate);
351351
}
352352
},
353-
PredicateKind::Clause(ClauseKind::Projection(projection_predicate)) => {
353+
ClauseKind::Projection(projection_predicate) => {
354354
if projection_predicate.projection_ty.self_ty() == input {
355355
projection_predicates.push(projection_predicate);
356356
}
@@ -407,7 +407,7 @@ fn can_change_type<'a>(cx: &LateContext<'a>, mut expr: &'a Expr<'a>, mut ty: Ty<
407407

408408
let mut trait_predicates = cx.tcx.param_env(callee_def_id)
409409
.caller_bounds().iter().filter(|predicate| {
410-
if let PredicateKind::Clause(ClauseKind::Trait(trait_predicate))
410+
if let ClauseKind::Trait(trait_predicate)
411411
= predicate.kind().skip_binder()
412412
&& trait_predicate.trait_ref.self_ty() == *param_ty
413413
{

‎clippy_lints/src/needless_pass_by_value.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ impl<'tcx> LateLintPass<'tcx> for NeedlessPassByValue {
126126
.filter_map(|pred| {
127127
// Note that we do not want to deal with qualified predicates here.
128128
match pred.kind().no_bound_vars() {
129-
Some(ty::PredicateKind::Clause(ty::ClauseKind::Trait(pred))) if pred.def_id() != sized_trait => {
129+
Some(ty::ClauseKind::Trait(pred)) if pred.def_id() != sized_trait => {
130130
Some(pred)
131131
},
132132
_ => None,

‎clippy_lints/src/unit_return_expecting_ord.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use rustc_hir::def_id::DefId;
44
use rustc_hir::{Closure, Expr, ExprKind, StmtKind};
55
use rustc_lint::{LateContext, LateLintPass};
66
use rustc_middle::ty;
7-
use rustc_middle::ty::{ClauseKind, GenericPredicates, PredicateKind, ProjectionPredicate, TraitPredicate};
7+
use rustc_middle::ty::{ClauseKind, GenericPredicates, ProjectionPredicate, TraitPredicate};
88
use rustc_session::{declare_lint_pass, declare_tool_lint};
99
use rustc_span::{sym, BytePos, Span};
1010

@@ -45,7 +45,7 @@ fn get_trait_predicates_for_trait_id<'tcx>(
4545
let mut preds = Vec::new();
4646
for (pred, _) in generics.predicates {
4747
if_chain! {
48-
if let PredicateKind::Clause(ClauseKind::Trait(poly_trait_pred)) = pred.kind().skip_binder();
48+
if let ClauseKind::Trait(poly_trait_pred) = pred.kind().skip_binder();
4949
let trait_pred = cx.tcx.erase_late_bound_regions(pred.kind().rebind(poly_trait_pred));
5050
if let Some(trait_def_id) = trait_id;
5151
if trait_def_id == trait_pred.trait_ref.def_id;
@@ -63,7 +63,7 @@ fn get_projection_pred<'tcx>(
6363
trait_pred: TraitPredicate<'tcx>,
6464
) -> Option<ProjectionPredicate<'tcx>> {
6565
generics.predicates.iter().find_map(|(proj_pred, _)| {
66-
if let ty::PredicateKind::Clause(ClauseKind::Projection(pred)) = proj_pred.kind().skip_binder() {
66+
if let ClauseKind::Projection(pred) = proj_pred.kind().skip_binder() {
6767
let projection_pred = cx.tcx.erase_late_bound_regions(proj_pred.kind().rebind(pred));
6868
if projection_pred.projection_ty.substs == trait_pred.trait_ref.substs {
6969
return Some(projection_pred);

‎clippy_utils/src/eager_or_lazy.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use rustc_hir::def::{DefKind, Res};
1515
use rustc_hir::intravisit::{walk_expr, Visitor};
1616
use rustc_hir::{def_id::DefId, Block, Expr, ExprKind, QPath, UnOp};
1717
use rustc_lint::LateContext;
18-
use rustc_middle::ty::{self, PredicateKind};
18+
use rustc_middle::ty;
1919
use rustc_span::{sym, Symbol};
2020
use std::cmp;
2121
use std::ops;
@@ -73,7 +73,7 @@ fn fn_eagerness(cx: &LateContext<'_>, fn_id: DefId, name: Symbol, have_one_arg:
7373
.flat_map(|v| v.fields.iter())
7474
.any(|x| matches!(cx.tcx.type_of(x.did).subst_identity().peel_refs().kind(), ty::Param(_)))
7575
&& all_predicates_of(cx.tcx, fn_id).all(|(pred, _)| match pred.kind().skip_binder() {
76-
PredicateKind::Clause(ty::ClauseKind::Trait(pred)) => cx.tcx.trait_def(pred.trait_ref.def_id).is_marker,
76+
ty::ClauseKind::Trait(pred) => cx.tcx.trait_def(pred.trait_ref.def_id).is_marker,
7777
_ => true,
7878
})
7979
&& subs.types().all(|x| matches!(x.peel_refs().kind(), ty::Param(_)))

‎clippy_utils/src/qualify_min_const_fn.rs‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,6 @@ type McfResult = Result<(), (Span, Cow<'static, str>)>;
2121

2222
pub fn is_min_const_fn<'tcx>(tcx: TyCtxt<'tcx>, body: &Body<'tcx>, msrv: &Msrv) -> McfResult {
2323
let def_id = body.source.def_id();
24-
let mut current = def_id;
25-
loop {
26-
let predicates = tcx.predicates_of(current);
27-
for (predicate, _) in predicates.predicates {
28-
match predicate.kind().skip_binder() {
29-
ty::PredicateKind::Clause(
30-
ty::ClauseKind::RegionOutlives(_)
31-
| ty::ClauseKind::TypeOutlives(_)
32-
| ty::ClauseKind::Projection(_)
33-
| ty::ClauseKind::Trait(..)
34-
| ty::ClauseKind::ConstArgHasType(..),
35-
)
36-
| ty::PredicateKind::Clause(ty::ClauseKind::WellFormed(_))
37-
| ty::PredicateKind::Clause(ty::ClauseKind::ConstEvaluatable(..))
38-
| ty::PredicateKind::ConstEquate(..)
39-
| ty::PredicateKind::TypeWellFormedFromEnv(..) => continue,
40-
ty::PredicateKind::AliasRelate(..) => panic!("alias relate predicate on function: {predicate:#?}"),
41-
ty::PredicateKind::ObjectSafe(_) => panic!("object safe predicate on function: {predicate:#?}"),
42-
ty::PredicateKind::ClosureKind(..) => panic!("closure kind predicate on function: {predicate:#?}"),
43-
ty::PredicateKind::Subtype(_) => panic!("subtype predicate on function: {predicate:#?}"),
44-
ty::PredicateKind::Coerce(_) => panic!("coerce predicate on function: {predicate:#?}"),
45-
ty::PredicateKind::Ambiguous => panic!("ambiguous predicate on function: {predicate:#?}"),
46-
}
47-
}
48-
match predicates.parent {
49-
Some(parent) => current = parent,
50-
None => break,
51-
}
52-
}
5324

5425
for local in &body.local_decls {
5526
check_ty(tcx, local.ty, local.source_info.span)?;

‎clippy_utils/src/ty.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use rustc_lint::LateContext;
1717
use rustc_middle::mir::interpret::{ConstValue, Scalar};
1818
use rustc_middle::ty::{
1919
self, layout::ValidityRequirement, AdtDef, AliasTy, AssocKind, Binder, BoundRegion, FnSig, IntTy, List, ParamEnv,
20-
Predicate, PredicateKind, Region, RegionKind, SubstsRef, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable,
20+
Region, RegionKind, SubstsRef, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable,
2121
TypeVisitableExt, TypeVisitor, UintTy, VariantDef, VariantDiscr,
2222
};
2323
use rustc_middle::ty::{GenericArg, GenericArgKind};
@@ -563,7 +563,7 @@ fn is_uninit_value_valid_for_ty_fallback<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'t
563563
}
564564

565565
/// Gets an iterator over all predicates which apply to the given item.
566-
pub fn all_predicates_of(tcx: TyCtxt<'_>, id: DefId) -> impl Iterator<Item = &(Predicate<'_>, Span)> {
566+
pub fn all_predicates_of(tcx: TyCtxt<'_>, id: DefId) -> impl Iterator<Item = &(ty::Clause<'_>, Span)> {
567567
let mut next_id = Some(id);
568568
iter::from_fn(move || {
569569
next_id.take().map(|id| {
@@ -665,7 +665,7 @@ pub fn ty_sig<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> Option<ExprFnSig<'t
665665
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) => sig_from_bounds(
666666
cx,
667667
ty,
668-
cx.tcx.item_bounds(def_id).subst_iter(cx.tcx, substs).map(|c| c.as_predicate()),
668+
cx.tcx.item_bounds(def_id).subst_iter(cx.tcx, substs),
669669
cx.tcx.opt_parent(def_id),
670670
),
671671
ty::FnPtr(sig) => Some(ExprFnSig::Sig(sig, None)),
@@ -698,7 +698,7 @@ pub fn ty_sig<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> Option<ExprFnSig<'t
698698
fn sig_from_bounds<'tcx>(
699699
cx: &LateContext<'tcx>,
700700
ty: Ty<'tcx>,
701-
predicates: impl IntoIterator<Item = Predicate<'tcx>>,
701+
predicates: impl IntoIterator<Item = ty::Clause<'tcx>>,
702702
predicates_id: Option<DefId>,
703703
) -> Option<ExprFnSig<'tcx>> {
704704
let mut inputs = None;
@@ -707,7 +707,7 @@ fn sig_from_bounds<'tcx>(
707707

708708
for pred in predicates {
709709
match pred.kind().skip_binder() {
710-
PredicateKind::Clause(ty::ClauseKind::Trait(p))
710+
ty::ClauseKind::Trait(p)
711711
if (lang_items.fn_trait() == Some(p.def_id())
712712
|| lang_items.fn_mut_trait() == Some(p.def_id())
713713
|| lang_items.fn_once_trait() == Some(p.def_id()))
@@ -720,7 +720,7 @@ fn sig_from_bounds<'tcx>(
720720
}
721721
inputs = Some(i);
722722
},
723-
PredicateKind::Clause(ty::ClauseKind::Projection(p))
723+
ty::ClauseKind::Projection(p)
724724
if Some(p.projection_ty.def_id) == lang_items.fn_once_output() && p.projection_ty.self_ty() == ty =>
725725
{
726726
if output.is_some() {
@@ -937,7 +937,7 @@ pub fn adt_and_variant_of_res<'tcx>(cx: &LateContext<'tcx>, res: Res) -> Option<
937937
}
938938

939939
/// Checks if the type is a type parameter implementing `FnOnce`, but not `FnMut`.
940-
pub fn ty_is_fn_once_param<'tcx>(tcx: TyCtxt<'_>, ty: Ty<'tcx>, predicates: &'tcx [Predicate<'_>]) -> bool {
940+
pub fn ty_is_fn_once_param<'tcx>(tcx: TyCtxt<'_>, ty: Ty<'tcx>, predicates: &'tcx [ty::Clause<'_>]) -> bool {
941941
let ty::Param(ty) = *ty.kind() else {
942942
return false;
943943
};
@@ -950,7 +950,7 @@ pub fn ty_is_fn_once_param<'tcx>(tcx: TyCtxt<'_>, ty: Ty<'tcx>, predicates: &'tc
950950
predicates
951951
.iter()
952952
.try_fold(false, |found, p| {
953-
if let PredicateKind::Clause(ty::ClauseKind::Trait(p)) = p.kind().skip_binder()
953+
if let ty::ClauseKind::Trait(p) = p.kind().skip_binder()
954954
&& let ty::Param(self_ty) = p.trait_ref.self_ty().kind()
955955
&& ty.index == self_ty.index
956956
{

0 commit comments

Comments
 (0)