Skip to content

Commit 80bff87

Browse files
committed
move Constness into TraitPredicate
1 parent 456e48f commit 80bff87

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

clippy_lints/src/future_not_send.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ impl<'tcx> LateLintPass<'tcx> for FutureNotSend {
9393
cx.tcx.infer_ctxt().enter(|infcx| {
9494
for FulfillmentError { obligation, .. } in send_errors {
9595
infcx.maybe_note_obligation_cause_for_async_await(db, &obligation);
96-
if let Trait(trait_pred, _) = obligation.predicate.kind().skip_binder() {
96+
if let Trait(trait_pred) = obligation.predicate.kind().skip_binder() {
9797
db.note(&format!(
9898
"`{}` doesn't implement `{}`",
9999
trait_pred.self_ty(),

clippy_lints/src/needless_pass_by_value.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl<'tcx> LateLintPass<'tcx> for NeedlessPassByValue {
121121
.filter_map(|obligation| {
122122
// Note that we do not want to deal with qualified predicates here.
123123
match obligation.predicate.kind().no_bound_vars() {
124-
Some(ty::PredicateKind::Trait(pred, _)) if pred.def_id() != sized_trait => Some(pred),
124+
Some(ty::PredicateKind::Trait(pred)) if pred.def_id() != sized_trait => Some(pred),
125125
_ => None,
126126
}
127127
})

clippy_lints/src/unit_return_expecting_ord.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -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::Trait(poly_trait_pred, _) = pred.kind().skip_binder();
48+
if let PredicateKind::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;

clippy_utils/src/qualify_min_const_fn.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub fn is_min_const_fn(tcx: TyCtxt<'tcx>, body: &'a Body<'tcx>, msrv: Option<&Ru
3636
ty::PredicateKind::ObjectSafe(_) => panic!("object safe predicate on function: {:#?}", predicate),
3737
ty::PredicateKind::ClosureKind(..) => panic!("closure kind predicate on function: {:#?}", predicate),
3838
ty::PredicateKind::Subtype(_) => panic!("subtype predicate on function: {:#?}", predicate),
39-
ty::PredicateKind::Trait(pred, _) => {
39+
ty::PredicateKind::Trait(pred) => {
4040
if Some(pred.def_id()) == tcx.lang_items().sized_trait() {
4141
continue;
4242
}

clippy_utils/src/ty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ pub fn is_must_use_ty<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
157157
ty::Tuple(substs) => substs.types().any(|ty| is_must_use_ty(cx, ty)),
158158
ty::Opaque(ref def_id, _) => {
159159
for (predicate, _) in cx.tcx.explicit_item_bounds(*def_id) {
160-
if let ty::PredicateKind::Trait(trait_predicate, _) = predicate.kind().skip_binder() {
160+
if let ty::PredicateKind::Trait(trait_predicate) = predicate.kind().skip_binder() {
161161
if must_use_attr(cx.tcx.get_attrs(trait_predicate.trait_ref.def_id)).is_some() {
162162
return true;
163163
}

0 commit comments

Comments
 (0)