Skip to content

Commit e0496f2

Browse files
committed
refac: organize function argument order
* put `second_arg` next to `arg` argument
1 parent aadc74f commit e0496f2

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

clippy_lints/src/methods/or_fun_call.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ pub(super) fn check<'tcx>(
8383
method_span: Span,
8484
self_expr: &hir::Expr<'_>,
8585
arg: &'tcx hir::Expr<'_>,
86+
// `Some` if fn has second argument
87+
second_arg: Option<&hir::Expr<'_>>,
8688
span: Span,
8789
// None if lambda is required
8890
fun_span: Option<Span>,
89-
// `Some` if fn has second argument
90-
second_arg: Option<&hir::Expr<'_>>,
9191
) {
9292
// (path, fn_has_argument, methods, suffix)
9393
const KNOW_TYPES: [(Symbol, bool, &[&str], &str); 4] = [
@@ -184,11 +184,11 @@ pub(super) fn check<'tcx>(
184184
let or_has_args = !or_args.is_empty();
185185
if !check_unwrap_or_default(cx, name, fun, arg, or_has_args, expr.span, method_span) {
186186
let fun_span = if or_has_args { None } else { Some(fun.span) };
187-
check_general_case(cx, name, method_span, receiver, arg, expr.span, fun_span, None);
187+
check_general_case(cx, name, method_span, receiver, arg, None, expr.span, fun_span);
188188
}
189189
},
190190
hir::ExprKind::Index(..) | hir::ExprKind::MethodCall(..) => {
191-
check_general_case(cx, name, method_span, receiver, arg, expr.span, None, None);
191+
check_general_case(cx, name, method_span, receiver, arg, None, expr.span, None);
192192
},
193193
_ => (),
194194
}
@@ -199,7 +199,7 @@ pub(super) fn check<'tcx>(
199199
let inner_arg = extract_inner_arg(arg);
200200
if let hir::ExprKind::Call(fun, or_args) = inner_arg.kind {
201201
let fun_span = if or_args.is_empty() { Some(fun.span) } else { None };
202-
check_general_case(cx, name, method_span, receiver, arg, expr.span, fun_span, Some(lambda));
202+
check_general_case(cx, name, method_span, receiver, arg, Some(lambda), expr.span, fun_span);
203203
}
204204
}
205205
}

0 commit comments

Comments
 (0)