diff options
| author | bors <bors@rust-lang.org> | 2022-09-05 13:36:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-05 13:36:54 +0000 |
| commit | 5ea99770d81504a42b970dc20778a8369073bf6a (patch) | |
| tree | 9fc62dd12f6b4789787327a5054c9ff3e3c7ee25 | |
| parent | 9ae329232b368c6ca7352d403de9e34a71debc4b (diff) | |
| parent | 25f6f188345bb2fc5d826ea8eb9346a1d51ce98c (diff) | |
| download | rust-5ea99770d81504a42b970dc20778a8369073bf6a.tar.gz rust-5ea99770d81504a42b970dc20778a8369073bf6a.zip | |
Auto merge of #101228 - nnethercote:simplify-hir-PathSegment, r=petrochenkov
Simplify `hir::PathSegment` r? `@petrochenkov`
| -rw-r--r-- | clippy_lints/src/operators/op_ref.rs | 2 | ||||
| -rw-r--r-- | clippy_lints/src/ref_option_ref.rs | 3 | ||||
| -rw-r--r-- | clippy_lints/src/trait_bounds.rs | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/clippy_lints/src/operators/op_ref.rs b/clippy_lints/src/operators/op_ref.rs index 1805672e372..1085e608944 100644 --- a/clippy_lints/src/operators/op_ref.rs +++ b/clippy_lints/src/operators/op_ref.rs @@ -185,7 +185,7 @@ fn in_impl<'tcx>( if let ItemKind::Impl(item) = &item.kind; if let Some(of_trait) = &item.of_trait; if let Some(seg) = of_trait.path.segments.last(); - if let Some(Res::Def(_, trait_id)) = seg.res; + if let Res::Def(_, trait_id) = seg.res; if trait_id == bin_op; if let Some(generic_args) = seg.args; if let Some(GenericArg::Type(other_ty)) = generic_args.args.last(); diff --git a/clippy_lints/src/ref_option_ref.rs b/clippy_lints/src/ref_option_ref.rs index 909d6971a54..42514f861be 100644 --- a/clippy_lints/src/ref_option_ref.rs +++ b/clippy_lints/src/ref_option_ref.rs @@ -43,8 +43,7 @@ impl<'tcx> LateLintPass<'tcx> for RefOptionRef { if mut_ty.mutbl == Mutability::Not; if let TyKind::Path(ref qpath) = &mut_ty.ty.kind; let last = last_path_segment(qpath); - if let Some(res) = last.res; - if let Some(def_id) = res.opt_def_id(); + if let Some(def_id) = last.res.opt_def_id(); if cx.tcx.is_diagnostic_item(sym::Option, def_id); if let Some(params) = last_path_segment(qpath).args ; diff --git a/clippy_lints/src/trait_bounds.rs b/clippy_lints/src/trait_bounds.rs index 2ffa022b04f..a25be93b8d6 100644 --- a/clippy_lints/src/trait_bounds.rs +++ b/clippy_lints/src/trait_bounds.rs @@ -128,7 +128,7 @@ impl<'tcx> LateLintPass<'tcx> for TraitBounds { if !bound_predicate.span.from_expansion(); if let TyKind::Path(QPath::Resolved(_, Path { segments, .. })) = bound_predicate.bounded_ty.kind; if let Some(PathSegment { - res: Some(Res::SelfTy{ trait_: Some(def_id), alias_to: _ }), .. + res: Res::SelfTy{ trait_: Some(def_id), alias_to: _ }, .. }) = segments.first(); if let Some( Node::Item( |