Rollup merge of #134460 - oli-obk:push-ysuklyupnzpq, r=jieyouxu
Merge some patterns together just something I noticed while browsing code. No change in functionality, deduplicates the 100% equal match arms by creating one big or pattern
This commit is contained in:
commit
29d201a3cb
1 changed files with 5 additions and 21 deletions
|
@ -170,27 +170,11 @@ impl<'tcx> LateLintPass<'tcx> for TyTyKind {
|
|||
| PatKind::TupleStruct(qpath, ..)
|
||||
| PatKind::Struct(qpath, ..),
|
||||
..
|
||||
}) => {
|
||||
if let QPath::TypeRelative(qpath_ty, ..) = qpath
|
||||
&& qpath_ty.hir_id == ty.hir_id
|
||||
{
|
||||
Some(path.span)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
Node::Expr(Expr { kind: ExprKind::Path(qpath), .. }) => {
|
||||
if let QPath::TypeRelative(qpath_ty, ..) = qpath
|
||||
&& qpath_ty.hir_id == ty.hir_id
|
||||
{
|
||||
Some(path.span)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
// Can't unify these two branches because qpath below is `&&` and above is `&`
|
||||
// and `A | B` paths don't play well together with adjustments, apparently.
|
||||
Node::Expr(Expr { kind: ExprKind::Struct(qpath, ..), .. }) => {
|
||||
})
|
||||
| Node::Expr(
|
||||
Expr { kind: ExprKind::Path(qpath), .. }
|
||||
| &Expr { kind: ExprKind::Struct(qpath, ..), .. },
|
||||
) => {
|
||||
if let QPath::TypeRelative(qpath_ty, ..) = qpath
|
||||
&& qpath_ty.hir_id == ty.hir_id
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue