Skip to content

Commit b541884

Browse files
committed
remove the explicit return value of print_limit
1 parent 7820cb1 commit b541884

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

clippy_lints/src/loops.rs

+20-21
Original file line numberDiff line numberDiff line change
@@ -1082,30 +1082,29 @@ fn build_manual_memcpy_suggestion<'tcx>(
10821082
}
10831083
}
10841084

1085-
let print_limit =
1086-
|end: &Expr<'_>, end_str: &str, base: &Expr<'_>, sugg: MinifyingSugg<'static>| -> MinifyingSugg<'static> {
1087-
if_chain! {
1088-
if let ExprKind::MethodCall(method, _, len_args, _) = end.kind;
1089-
if method.ident.name == sym!(len);
1090-
if len_args.len() == 1;
1091-
if let Some(arg) = len_args.get(0);
1092-
if var_def_id(cx, arg) == var_def_id(cx, base);
1093-
then {
1094-
if sugg.as_str() == end_str {
1095-
sugg::EMPTY.into()
1096-
} else {
1097-
sugg
1098-
}
1085+
let print_limit = |end: &Expr<'_>, end_str: &str, base: &Expr<'_>, sugg: MinifyingSugg<'static>| {
1086+
if_chain! {
1087+
if let ExprKind::MethodCall(method, _, len_args, _) = end.kind;
1088+
if method.ident.name == sym!(len);
1089+
if len_args.len() == 1;
1090+
if let Some(arg) = len_args.get(0);
1091+
if var_def_id(cx, arg) == var_def_id(cx, base);
1092+
then {
1093+
if sugg.as_str() == end_str {
1094+
sugg::EMPTY.into()
10991095
} else {
1100-
match limits {
1101-
ast::RangeLimits::Closed => {
1102-
sugg + &sugg::ONE.into()
1103-
},
1104-
ast::RangeLimits::HalfOpen => sugg,
1105-
}
1096+
sugg
1097+
}
1098+
} else {
1099+
match limits {
1100+
ast::RangeLimits::Closed => {
1101+
sugg + &sugg::ONE.into()
1102+
},
1103+
ast::RangeLimits::HalfOpen => sugg,
11061104
}
11071105
}
1108-
};
1106+
}
1107+
};
11091108

11101109
let start_str = Sugg::hir(cx, start, "").into();
11111110
let end_str: MinifyingSugg<'_> = Sugg::hir(cx, end, "").into();

0 commit comments

Comments
 (0)