Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-23 21:23:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Deduplicate some code?

Browse source
This commit is contained in:
Peter Fürstenau 2018-12-18 11:25:13 +01:00
parent 176778fe92
commit 8b0ea22885
1 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
clippy_lints/src/question_mark.rs
View file

@ -72,6 +72,8 @@ impl Pass {
if Self::is_option(cx, subject);
then {
let receiver_str = &Sugg::hir(cx, subject, "..");
let mut replacement_str = String::new();
if let Some(else_) = else_ {
if_chain! {
if let ExprKind::Block(block, None) = &else_.node;
@ -79,6 +81,12 @@ impl Pass {
if let Some(block_expr) = &block.expr;
if SpanlessEq::new(cx).ignore_fn().eq_expr(subject, block_expr);
then {
replacement_str = format!("Some({}?)", receiver_str);
}
}
} else {
replacement_str = format!("{}?;", receiver_str);
}
span_lint_and_then(
cx,
QUESTION_MARK,
@ -88,28 +96,7 @@ impl Pass {
db.span_suggestion_with_applicability(
expr.span,
"replace_it_with",
format!("Some({}?)", Sugg::hir(cx, subject, "..")),
Applicability::MaybeIncorrect, // snippet
);
}
)
}
}
return;
}
span_lint_and_then(
cx,
QUESTION_MARK,
expr.span,
"this block may be rewritten with the `?` operator",
|db| {
let receiver_str = &Sugg::hir(cx, subject, "..");
db.span_suggestion_with_applicability(
expr.span,
"replace_it_with",
format!("{}?;", receiver_str),
replacement_str,
Applicability::MaybeIncorrect, // snippet
);
}
@ -132,7 +119,7 @@ impl Pass {
}
false
},
}
ExprKind::Ret(Some(ref expr)) => Self::expression_returns_none(cx, expr),
ExprKind::Path(ref qp) => {
if let Def::VariantCtor(def_id, _) = cx.tables.qpath_def(qp, expression.hir_id) {
@ -140,7 +127,7 @@ impl Pass {
}
false
},
}
_ => false,
}
}