Further Clippy fixes for Tup/Literal ConstArgKind

Author: flip1995

src/tools/clippy/clippy_utils/src/consts.rs

@@ -1142,6 +1142,7 @@ pub fn const_item_rhs_to_expr<'tcx>(tcx: TyCtxt<'tcx>, ct_rhs: ConstItemRhs<'tcx
             ConstArgKind::Anon(anon) => Some(tcx.hir_body(anon.body).value),
             ConstArgKind::Struct(..)
             | ConstArgKind::Tup(..)
+            | ConstArgKind::Literal(..)
             | ConstArgKind::TupleCall(..)
             | ConstArgKind::Path(_)
             | ConstArgKind::Error(..)

src/tools/clippy/clippy_utils/src/hir_utils.rs

@@ -666,8 +666,9 @@ impl HirEqInterExpr<'_, '_, '_> {
         }
 
         match (&left.kind, &right.kind) {
-            (ConstArgKind::Tup(l_t), ConstArgKind::Tup(r_t)) =>
-                l_t.len() == r_t.len() && l_t.iter().zip(*r_t).all(|(l_c, r_c)| self.eq_const_arg(*l_c, *r_c)),
+            (ConstArgKind::Tup(l_t), ConstArgKind::Tup(r_t)) => {
+                l_t.len() == r_t.len() && l_t.iter().zip(*r_t).all(|(l_c, r_c)| self.eq_const_arg(*l_c, *r_c))
+            },
             (ConstArgKind::Path(l_p), ConstArgKind::Path(r_p)) => self.eq_qpath(l_p, r_p),
             (ConstArgKind::Anon(l_an), ConstArgKind::Anon(r_an)) => self.eq_body(l_an.body, r_an.body),
             (ConstArgKind::Infer(..), ConstArgKind::Infer(..)) => true,
@@ -684,23 +685,14 @@ impl HirEqInterExpr<'_, '_, '_> {
                         .iter()
                         .zip(*args_b)
                         .all(|(arg_a, arg_b)| self.eq_const_arg(arg_a, arg_b))
-            }
-            (ConstArgKind::Tup(args_a), ConstArgKind::Tup(args_b)) => {
-                args_a
-                    .iter()
-                    .zip(*args_b)
-                    .all(|(arg_a, arg_b)| self.eq_const_arg(arg_a, arg_b))
-            },
-            (ConstArgKind::Literal(kind_l), ConstArgKind::Literal(kind_r)) => {
-                kind_l == kind_r
             },
+            (ConstArgKind::Literal(kind_l), ConstArgKind::Literal(kind_r)) => kind_l == kind_r,
             // Use explicit match for now since ConstArg is undergoing flux.
             (
                 ConstArgKind::Path(..)
                 | ConstArgKind::Tup(..)
                 | ConstArgKind::Anon(..)
                 | ConstArgKind::TupleCall(..)
-                | ConstArgKind::Tup(..)
                 | ConstArgKind::Infer(..)
                 | ConstArgKind::Struct(..)
                 | ConstArgKind::Literal(..)
@@ -1583,13 +1575,8 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
                     self.hash_const_arg(arg);
                 }
             },
-            ConstArgKind::Tup(args) => {
-                for arg in *args {
-                    self.hash_const_arg(arg);
-                }
-            },
             ConstArgKind::Infer(..) | ConstArgKind::Error(..) => {},
-            ConstArgKind::Literal(lit) => lit.hash(&mut self.s)
+            ConstArgKind::Literal(lit) => lit.hash(&mut self.s),
         }
     }