Skip to content

Commit ed69835

Browse files
committed
basically clippy::let_if_seq
1 parent cb3e5af commit ed69835

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

clippy_lints/src/matches/try_err.rs

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,15 @@ pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>, scrutine
2828
&& is_res_lang_ctor(cx, path_res(cx, err_fun), ResultErr)
2929
&& let Some(return_ty) = find_return_type(cx, &expr.kind)
3030
{
31-
let prefix;
32-
let suffix;
33-
let err_ty;
34-
35-
if let Some(ty) = result_error_type(cx, return_ty) {
36-
prefix = "Err(";
37-
suffix = ")";
38-
err_ty = ty;
31+
let (prefix, suffix, err_ty) = if let Some(ty) = result_error_type(cx, return_ty) {
32+
("Err(", ")", ty)
3933
} else if let Some(ty) = poll_result_error_type(cx, return_ty) {
40-
prefix = "Poll::Ready(Err(";
41-
suffix = "))";
42-
err_ty = ty;
34+
("Poll::Ready(Err(", "))", ty)
4335
} else if let Some(ty) = poll_option_result_error_type(cx, return_ty) {
44-
prefix = "Poll::Ready(Some(Err(";
45-
suffix = ")))";
46-
err_ty = ty;
36+
("Poll::Ready(Some(Err(", ")))", ty)
4737
} else {
4838
return;
49-
}
39+
};
5040

5141
span_lint_and_then(
5242
cx,

0 commit comments

Comments
 (0)