diff options
| author | rail <12975677+rail-rain@users.noreply.github.com> | 2020-10-02 23:38:10 +1300 |
|---|---|---|
| committer | rail <12975677+rail-rain@users.noreply.github.com> | 2020-10-02 23:38:10 +1300 |
| commit | b54188429409a6da5f931fa4be5df1f40b377015 (patch) | |
| tree | 44ca743b32575b55f129a96d8879ad85f3c9d2d9 | |
| parent | 7820cb14421f751c05d6d2d5925236c3429cd93f (diff) | |
| download | rust-b54188429409a6da5f931fa4be5df1f40b377015.tar.gz rust-b54188429409a6da5f931fa4be5df1f40b377015.zip | |
remove the explicit return value of `print_limit`
| -rw-r--r-- | clippy_lints/src/loops.rs | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs index d3a1683cc0c..3e9265c1215 100644 --- a/clippy_lints/src/loops.rs +++ b/clippy_lints/src/loops.rs @@ -1082,30 +1082,29 @@ fn build_manual_memcpy_suggestion<'tcx>( } } - let print_limit = - |end: &Expr<'_>, end_str: &str, base: &Expr<'_>, sugg: MinifyingSugg<'static>| -> MinifyingSugg<'static> { - if_chain! { - if let ExprKind::MethodCall(method, _, len_args, _) = end.kind; - if method.ident.name == sym!(len); - if len_args.len() == 1; - if let Some(arg) = len_args.get(0); - if var_def_id(cx, arg) == var_def_id(cx, base); - then { - if sugg.as_str() == end_str { - sugg::EMPTY.into() - } else { - sugg - } + let print_limit = |end: &Expr<'_>, end_str: &str, base: &Expr<'_>, sugg: MinifyingSugg<'static>| { + if_chain! { + if let ExprKind::MethodCall(method, _, len_args, _) = end.kind; + if method.ident.name == sym!(len); + if len_args.len() == 1; + if let Some(arg) = len_args.get(0); + if var_def_id(cx, arg) == var_def_id(cx, base); + then { + if sugg.as_str() == end_str { + sugg::EMPTY.into() } else { - match limits { - ast::RangeLimits::Closed => { - sugg + &sugg::ONE.into() - }, - ast::RangeLimits::HalfOpen => sugg, - } + sugg + } + } else { + match limits { + ast::RangeLimits::Closed => { + sugg + &sugg::ONE.into() + }, + ast::RangeLimits::HalfOpen => sugg, } } - }; + } + }; let start_str = Sugg::hir(cx, start, "").into(); let end_str: MinifyingSugg<'_> = Sugg::hir(cx, end, "").into(); |
