fix extract arguments

Author: ABouttefeux

clippy_lints/src/bool_assert_comparison.rs

@@ -112,12 +112,12 @@ impl<'tcx> LateLintPass<'tcx> for BoolAssertComparison {
                         let arg_span = match fmt_args {
                             [] => None,
                             [a] => Some(format!(
-                                "{}",
+                                ".., {}",
                                 Sugg::hir_with_applicability(cx, a, "..", &mut applicability)
                             )),
                             _ => {
                                 let mut args = format!(
-                                    "{}",
+                                    ".., {}",
                                     Sugg::hir_with_applicability(cx, fmt_args[0], "..", &mut applicability)
                                 );
                                 for el in &fmt_args[1..] {

clippy_utils/src/higher.rs

@@ -448,20 +448,12 @@ pub fn extract_assert_macro_args<'tcx>(e: &'tcx Expr<'tcx>) -> Option<Vec<&'tcx
                     if args_assert_failed.len() >= 4;
                     if let ExprKind::Call(_, args) =  args_assert_failed[3].kind;
                     if !args.is_empty();
-                    if let ExprKind::Call(_, args_fmt) = args[0].kind;
-                    if !args_fmt.is_empty();
+                    if let ExprKind::Match(expr_match, _, _ ) = args[0].kind;
+                    if let ExprKind::Match(tup_match, _, _) = expr_match.kind;
+                    if let ExprKind::Tup(tup_args_list) = tup_match.kind;
                     then {
-                        vec_arg.push(&args_fmt[0]);
-                        if_chain! {
-                            if args_fmt.len() >= 2;
-                            if let ExprKind::AddrOf(_, _, expr_match) = args_fmt[1].kind;
-                            if let ExprKind::Match(tup_match, _, _) = expr_match.kind;
-                            if let ExprKind::Tup(tup_args_list) = tup_match.kind;
-                            then{
-                                for arg in tup_args_list {
-                                    vec_arg.push(arg);
-                                }
-                            }
+                        for arg in tup_args_list {
+                            vec_arg.push(arg);
                         }
                     }
                 }