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

Refactor out enum and address nits

Browse source
This commit is contained in:
Philipp Hansch 2018-04-15 15:37:11 +02:00
parent 4f4e20c561
commit 26b9911e07
No known key found for this signature in database
GPG key ID: B6FA06A6E0E2665B
1 changed files with 20 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
clippy_lints/src/map_unit_fn.rs
View file

@ -8,11 +8,11 @@ use utils::paths;
#[derive(Clone)] #[derive(Clone)]
pub struct Pass; pub struct Pass;
/// **What it does:** Checks for usage of `Option.map(f)` where f is a function /// **What it does:** Checks for usage of `option.map(f)` where f is a function
/// or closure that returns the unit type. /// or closure that returns the unit type.
/// ///
/// **Why is this bad?** Readability, this can be written more clearly with /// **Why is this bad?** Readability, this can be written more clearly with
/// an if statement /// an if let statement
/// ///
/// **Known problems:** None. /// **Known problems:** None.
/// ///
@ -38,14 +38,14 @@ pub struct Pass;
declare_clippy_lint! { declare_clippy_lint! {
pub OPTION_MAP_UNIT_FN, pub OPTION_MAP_UNIT_FN,
complexity, complexity,
"using `Option.map(f)`, where f is a function or closure that returns ()" "using `option.map(f)`, where f is a function or closure that returns ()"
} }
/// **What it does:** Checks for usage of `Result.map(f)` where f is a function /// **What it does:** Checks for usage of `result.map(f)` where f is a function
/// or closure that returns the unit type. /// or closure that returns the unit type.
/// ///
/// **Why is this bad?** Readability, this can be written more clearly with /// **Why is this bad?** Readability, this can be written more clearly with
/// an if statement /// an if let statement
/// ///
/// **Known problems:** None. /// **Known problems:** None.
/// ///
@ -71,7 +71,7 @@ declare_clippy_lint! {
declare_clippy_lint! { declare_clippy_lint! {
pub RESULT_MAP_UNIT_FN, pub RESULT_MAP_UNIT_FN,
complexity, complexity,
"using `Result.map(f)`, where f is a function or closure that returns ()" "using `result.map(f)`, where f is a function or closure that returns ()"
} }
@ -215,33 +215,21 @@ fn lint_map_unit_fn(cx: &LateContext, stmt: &hir::Stmt, expr: &hir::Expr, map_ar
} else if let Some((binding, closure_expr)) = unit_closure(cx, fn_arg) { } else if let Some((binding, closure_expr)) = unit_closure(cx, fn_arg) {
let msg = suggestion_msg("closure", map_type); let msg = suggestion_msg("closure", map_type);
enum Suggestion {
Full(String),
Approx(String)
}
let suggestion = if let Some(expr_span) = reduce_unit_expression(cx, closure_expr) {
Suggestion::Full(
format!("if let {0}({1}) = {2} {{ {3} }}",
variant,
snippet(cx, binding.pat.span, "_"),
snippet(cx, var_arg.span, "_"),
snippet(cx, expr_span, "_"))
)
} else {
Suggestion::Approx(
format!("if let {0}({1}) = {2} {{ ... }}",
variant,
snippet(cx, binding.pat.span, "_"),
snippet(cx, var_arg.span, "_"))
)
};
span_lint_and_then(cx, lint, expr.span, &msg, |db| { span_lint_and_then(cx, lint, expr.span, &msg, |db| {
match suggestion { if let Some(reduced_expr_span) = reduce_unit_expression(cx, closure_expr) {
Suggestion::Full(sugg) => db.span_suggestion(stmt.span, "try this", sugg), let suggestion = format!("if let {0}({1}) = {2} {{ {3} }}",
Suggestion::Approx(sugg) => db.span_approximate_suggestion(stmt.span, "try this", sugg), variant,
}; snippet(cx, binding.pat.span, "_"),
snippet(cx, var_arg.span, "_"),
snippet(cx, reduced_expr_span, "_"));
db.span_suggestion(stmt.span, "try this", suggestion);
} else {
let suggestion = format!("if let {0}({1}) = {2} {{ ... }}",
variant,
snippet(cx, binding.pat.span, "_"),
snippet(cx, var_arg.span, "_"));
db.span_approximate_suggestion(stmt.span, "try this", suggestion);
}
}); });
} }
} }