mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

manual-unwrap-or / more pr remarks

Browse Source
This commit is contained in:
Tim Nielens 2020-10-13 10:24:00 +02:00
parent fc846c37fc
commit a8fb69f065
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clippy_lints/src/manual_unwrap_or.rs
View File

@ -47,7 +47,7 @@ fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
}
}
fn lint_option_unwrap_or_case<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) -> bool {
fn lint_option_unwrap_or_case<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
fn applicable_none_arm<'a>(arms: &'a [Arm<'a>]) -> Option<&'a Arm<'a>> {
if_chain! {
if arms.len() == 2;
@ -69,8 +69,7 @@ fn applicable_none_arm<'a>(arms: &'a [Arm<'a>]) -> Option<&'a Arm<'a>> {
if !utils::usage::contains_return_break_continue_macro(none_arm.body);
then {
Some(none_arm)
}
else {
} else {
None
}
}
@ -102,14 +101,11 @@ fn applicable_none_arm<'a>(arms: &'a [Arm<'a>]) -> Option<&'a Arm<'a>> {
"{}.{}({}{})",
scrutinee_snippet,
method,
if eager_eval { ""} else { "|| " },
if eager_eval { "" } else { "|| " },
reindented_none_body
),
Applicability::MachineApplicable,
);
true
} else {
false
}
}
}