@@ -83,11 +83,11 @@ pub(super) fn check<'tcx>(
83
83
method_span : Span ,
84
84
self_expr : & hir:: Expr < ' _ > ,
85
85
arg : & ' tcx hir:: Expr < ' _ > ,
86
+ // `Some` if fn has second argument
87
+ second_arg : Option < & hir:: Expr < ' _ > > ,
86
88
span : Span ,
87
89
// None if lambda is required
88
90
fun_span : Option < Span > ,
89
- // `Some` if fn has second argument
90
- second_arg : Option < & hir:: Expr < ' _ > > ,
91
91
) {
92
92
// (path, fn_has_argument, methods, suffix)
93
93
const KNOW_TYPES : [ ( Symbol , bool , & [ & str ] , & str ) ; 4 ] = [
@@ -184,11 +184,11 @@ pub(super) fn check<'tcx>(
184
184
let or_has_args = !or_args. is_empty ( ) ;
185
185
if !check_unwrap_or_default ( cx, name, fun, arg, or_has_args, expr. span , method_span) {
186
186
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) ;
188
188
}
189
189
} ,
190
190
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 ) ;
192
192
} ,
193
193
_ => ( ) ,
194
194
}
@@ -199,7 +199,7 @@ pub(super) fn check<'tcx>(
199
199
let inner_arg = extract_inner_arg ( arg) ;
200
200
if let hir:: ExprKind :: Call ( fun, or_args) = inner_arg. kind {
201
201
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) ;
203
203
}
204
204
}
205
205
}
0 commit comments