diff options
| author | Michael Goulet <michael@errs.io> | 2024-08-29 00:17:40 -0400 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2024-08-29 00:17:40 -0400 |
| commit | 5bbb0d41f1637d3b6a54ded065e807a48c67aec0 (patch) | |
| tree | 218002a802bc45d0d0ee1aeeb2d9f7e2f56ae351 | |
| parent | 508a7b4b3825de2167beda7080d072dd3e5778c4 (diff) | |
| download | rust-5bbb0d41f1637d3b6a54ded065e807a48c67aec0.tar.gz rust-5bbb0d41f1637d3b6a54ded065e807a48c67aec0.zip | |
Stop using ty::GenericPredicates for non-predicates_of queries
| -rw-r--r-- | clippy_lints/src/implied_bounds_in_impls.rs | 2 | ||||
| -rw-r--r-- | clippy_lints/src/methods/type_id_on_box.rs | 3 | ||||
| -rw-r--r-- | clippy_lints/src/needless_maybe_sized.rs | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/clippy_lints/src/implied_bounds_in_impls.rs b/clippy_lints/src/implied_bounds_in_impls.rs index 67b48878ca5..6794c6cabfe 100644 --- a/clippy_lints/src/implied_bounds_in_impls.rs +++ b/clippy_lints/src/implied_bounds_in_impls.rs @@ -246,7 +246,7 @@ fn collect_supertrait_bounds<'tcx>(cx: &LateContext<'tcx>, bounds: GenericBounds && let [.., path] = poly_trait.trait_ref.path.segments && poly_trait.bound_generic_params.is_empty() && let Some(trait_def_id) = path.res.opt_def_id() - && let predicates = cx.tcx.explicit_super_predicates_of(trait_def_id).predicates + && let predicates = cx.tcx.explicit_super_predicates_of(trait_def_id).skip_binder() // If the trait has no supertrait, there is no need to collect anything from that bound && !predicates.is_empty() { diff --git a/clippy_lints/src/methods/type_id_on_box.rs b/clippy_lints/src/methods/type_id_on_box.rs index b62ecef0069..db8cc4595d4 100644 --- a/clippy_lints/src/methods/type_id_on_box.rs +++ b/clippy_lints/src/methods/type_id_on_box.rs @@ -25,8 +25,7 @@ fn is_subtrait_of_any(cx: &LateContext<'_>, ty: Ty<'_>) -> bool { || cx .tcx .explicit_super_predicates_of(tr.def_id) - .predicates - .iter() + .iter_identity_copied() .any(|(clause, _)| { matches!(clause.kind().skip_binder(), ty::ClauseKind::Trait(super_tr) if cx.tcx.is_diagnostic_item(sym::Any, super_tr.def_id())) diff --git a/clippy_lints/src/needless_maybe_sized.rs b/clippy_lints/src/needless_maybe_sized.rs index a1d8ec3b32e..62e41088f37 100644 --- a/clippy_lints/src/needless_maybe_sized.rs +++ b/clippy_lints/src/needless_maybe_sized.rs @@ -91,7 +91,7 @@ fn path_to_sized_bound(cx: &LateContext<'_>, trait_bound: &PolyTraitRef<'_>) -> return true; } - for &(predicate, _) in cx.tcx.explicit_super_predicates_of(trait_def_id).predicates { + for (predicate, _) in cx.tcx.explicit_super_predicates_of(trait_def_id).iter_identity_copied() { if let ClauseKind::Trait(trait_predicate) = predicate.kind().skip_binder() && trait_predicate.polarity == PredicatePolarity::Positive && !path.contains(&trait_predicate.def_id()) |