diff options
| author | bors <bors@rust-lang.org> | 2022-09-07 13:49:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-07 13:49:58 +0000 |
| commit | 567e1bbca7942c1f5353ca0b3b94210e4fc417c0 (patch) | |
| tree | b34ee2c8c2731c39bff3c9e46f389c277c941cb6 | |
| parent | 9cbbd4a80e2bb633c6cfc53a3e9cb08b1910ce5f (diff) | |
| parent | 2d4349c22d855f4735f89d5fcfc397ecb11f5b9c (diff) | |
| download | rust-567e1bbca7942c1f5353ca0b3b94210e4fc417c0.tar.gz rust-567e1bbca7942c1f5353ca0b3b94210e4fc417c0.zip | |
Auto merge of #101432 - nnethercote:shrink-PredicateS, r=lcnr
Shrink `PredicateS` r? `@ghost`
| -rw-r--r-- | clippy_lints/src/dereference.rs | 2 | ||||
| -rw-r--r-- | clippy_lints/src/methods/mod.rs | 6 | ||||
| -rw-r--r-- | clippy_lints/src/methods/unnecessary_to_owned.rs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/clippy_lints/src/dereference.rs b/clippy_lints/src/dereference.rs index ae509aab152..d1ab7fb6796 100644 --- a/clippy_lints/src/dereference.rs +++ b/clippy_lints/src/dereference.rs @@ -1175,7 +1175,7 @@ fn replace_types<'tcx>( if replaced.insert(param_ty.index) { for projection_predicate in projection_predicates { if projection_predicate.projection_ty.self_ty() == param_ty.to_ty(cx.tcx) - && let ty::Term::Ty(term_ty) = projection_predicate.term + && let Some(term_ty) = projection_predicate.term.ty() && let ty::Param(term_param_ty) = term_ty.kind() { let item_def_id = projection_predicate.projection_ty.item_def_id; diff --git a/clippy_lints/src/methods/mod.rs b/clippy_lints/src/methods/mod.rs index fc9ba15d82a..48a9d6e7c32 100644 --- a/clippy_lints/src/methods/mod.rs +++ b/clippy_lints/src/methods/mod.rs @@ -3304,9 +3304,9 @@ impl<'tcx> LateLintPass<'tcx> for Methods { // one of the associated types must be Self for &(predicate, _span) in cx.tcx.explicit_item_bounds(def_id) { if let ty::PredicateKind::Projection(projection_predicate) = predicate.kind().skip_binder() { - let assoc_ty = match projection_predicate.term { - ty::Term::Ty(ty) => ty, - ty::Term::Const(_c) => continue, + let assoc_ty = match projection_predicate.term.unpack() { + ty::TermKind::Ty(ty) => ty, + ty::TermKind::Const(_c) => continue, }; // walk the associated type and check for Self if let Some(self_adt) = self_ty.ty_adt_def() { diff --git a/clippy_lints/src/methods/unnecessary_to_owned.rs b/clippy_lints/src/methods/unnecessary_to_owned.rs index 9dceb9af2f2..85da97a39f9 100644 --- a/clippy_lints/src/methods/unnecessary_to_owned.rs +++ b/clippy_lints/src/methods/unnecessary_to_owned.rs @@ -274,7 +274,7 @@ fn check_other_call_arg<'tcx>( .subst_and_normalize_erasing_regions(call_substs, cx.param_env, projection_predicate.term); implements_trait(cx, receiver_ty, deref_trait_id, &[]) && get_associated_type(cx, receiver_ty, deref_trait_id, "Target") - .map_or(false, |ty| ty::Term::Ty(ty) == normalized_ty) + .map_or(false, |ty| ty::TermKind::Ty(ty) == normalized_ty.unpack()) } else { false } |