2020-04-12 08:23:07 -05:00
|
|
|
use crate::utils::{is_type_diagnostic_item, iter_input_pats, method_chain_args, snippet, span_lint_and_then};
|
2018-11-27 14:14:15 -06:00
|
|
|
use if_chain::if_chain;
|
2018-12-29 09:04:45 -06:00
|
|
|
use rustc_errors::Applicability;
|
2020-01-06 10:39:50 -06:00
|
|
|
use rustc_hir as hir;
|
2020-01-12 00:08:41 -06:00
|
|
|
use rustc_lint::{LateContext, LateLintPass};
|
2020-03-30 04:02:14 -05:00
|
|
|
use rustc_middle::ty::{self, Ty};
|
2020-01-11 05:37:08 -06:00
|
|
|
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
2020-01-04 04:00:00 -06:00
|
|
|
use rustc_span::source_map::Span;
|
2017-01-16 14:40:50 -06:00
|
|
|
|
2018-04-09 00:54:08 -05:00
|
|
|
declare_clippy_lint! {
|
2019-03-05 10:50:33 -06:00
|
|
|
/// **What it does:** Checks for usage of `option.map(f)` where f is a function
|
|
|
|
/// or closure that returns the unit type.
|
|
|
|
///
|
|
|
|
/// **Why is this bad?** Readability, this can be written more clearly with
|
|
|
|
/// an if let statement
|
|
|
|
///
|
|
|
|
/// **Known problems:** None.
|
|
|
|
///
|
|
|
|
/// **Example:**
|
|
|
|
///
|
|
|
|
/// ```rust
|
2019-08-02 01:13:54 -05:00
|
|
|
/// # fn do_stuff() -> Option<String> { Some(String::new()) }
|
|
|
|
/// # fn log_err_msg(foo: String) -> Option<String> { Some(foo) }
|
|
|
|
/// # fn format_msg(foo: String) -> String { String::new() }
|
|
|
|
/// let x: Option<String> = do_stuff();
|
2019-03-05 10:50:33 -06:00
|
|
|
/// x.map(log_err_msg);
|
2019-08-02 01:13:54 -05:00
|
|
|
/// # let x: Option<String> = do_stuff();
|
|
|
|
/// x.map(|msg| log_err_msg(format_msg(msg)));
|
2019-03-05 10:50:33 -06:00
|
|
|
/// ```
|
|
|
|
///
|
|
|
|
/// The correct use would be:
|
|
|
|
///
|
|
|
|
/// ```rust
|
2019-08-02 01:13:54 -05:00
|
|
|
/// # fn do_stuff() -> Option<String> { Some(String::new()) }
|
|
|
|
/// # fn log_err_msg(foo: String) -> Option<String> { Some(foo) }
|
|
|
|
/// # fn format_msg(foo: String) -> String { String::new() }
|
|
|
|
/// let x: Option<String> = do_stuff();
|
2019-03-05 10:50:33 -06:00
|
|
|
/// if let Some(msg) = x {
|
2019-08-02 01:13:54 -05:00
|
|
|
/// log_err_msg(msg);
|
2019-03-05 10:50:33 -06:00
|
|
|
/// }
|
2019-08-02 01:13:54 -05:00
|
|
|
///
|
|
|
|
/// # let x: Option<String> = do_stuff();
|
2019-03-05 10:50:33 -06:00
|
|
|
/// if let Some(msg) = x {
|
2019-08-02 01:13:54 -05:00
|
|
|
/// log_err_msg(format_msg(msg));
|
2019-03-05 10:50:33 -06:00
|
|
|
/// }
|
|
|
|
/// ```
|
2018-04-09 01:19:40 -05:00
|
|
|
pub OPTION_MAP_UNIT_FN,
|
2018-04-09 00:54:08 -05:00
|
|
|
complexity,
|
2020-01-06 00:30:43 -06:00
|
|
|
"using `option.map(f)`, where `f` is a function or closure that returns `()`"
|
2017-01-16 14:40:50 -06:00
|
|
|
}
|
|
|
|
|
2018-04-15 06:00:12 -05:00
|
|
|
declare_clippy_lint! {
|
2019-03-05 10:50:33 -06:00
|
|
|
/// **What it does:** Checks for usage of `result.map(f)` where f is a function
|
|
|
|
/// or closure that returns the unit type.
|
|
|
|
///
|
|
|
|
/// **Why is this bad?** Readability, this can be written more clearly with
|
|
|
|
/// an if let statement
|
|
|
|
///
|
|
|
|
/// **Known problems:** None.
|
|
|
|
///
|
|
|
|
/// **Example:**
|
|
|
|
///
|
|
|
|
/// ```rust
|
2019-08-02 01:13:54 -05:00
|
|
|
/// # fn do_stuff() -> Result<String, String> { Ok(String::new()) }
|
|
|
|
/// # fn log_err_msg(foo: String) -> Result<String, String> { Ok(foo) }
|
|
|
|
/// # fn format_msg(foo: String) -> String { String::new() }
|
|
|
|
/// let x: Result<String, String> = do_stuff();
|
2019-03-05 10:50:33 -06:00
|
|
|
/// x.map(log_err_msg);
|
2019-08-02 01:13:54 -05:00
|
|
|
/// # let x: Result<String, String> = do_stuff();
|
|
|
|
/// x.map(|msg| log_err_msg(format_msg(msg)));
|
2019-03-05 10:50:33 -06:00
|
|
|
/// ```
|
|
|
|
///
|
|
|
|
/// The correct use would be:
|
|
|
|
///
|
|
|
|
/// ```rust
|
2019-08-02 01:13:54 -05:00
|
|
|
/// # fn do_stuff() -> Result<String, String> { Ok(String::new()) }
|
|
|
|
/// # fn log_err_msg(foo: String) -> Result<String, String> { Ok(foo) }
|
|
|
|
/// # fn format_msg(foo: String) -> String { String::new() }
|
|
|
|
/// let x: Result<String, String> = do_stuff();
|
2019-03-05 10:50:33 -06:00
|
|
|
/// if let Ok(msg) = x {
|
2019-08-02 01:13:54 -05:00
|
|
|
/// log_err_msg(msg);
|
|
|
|
/// };
|
|
|
|
/// # let x: Result<String, String> = do_stuff();
|
2019-03-05 10:50:33 -06:00
|
|
|
/// if let Ok(msg) = x {
|
2019-08-02 01:13:54 -05:00
|
|
|
/// log_err_msg(format_msg(msg));
|
|
|
|
/// };
|
2019-03-05 10:50:33 -06:00
|
|
|
/// ```
|
2018-04-15 06:00:12 -05:00
|
|
|
pub RESULT_MAP_UNIT_FN,
|
|
|
|
complexity,
|
2020-01-06 00:30:43 -06:00
|
|
|
"using `result.map(f)`, where `f` is a function or closure that returns `()`"
|
2018-04-15 06:00:12 -05:00
|
|
|
}
|
|
|
|
|
2019-04-08 15:43:55 -05:00
|
|
|
declare_lint_pass!(MapUnit => [OPTION_MAP_UNIT_FN, RESULT_MAP_UNIT_FN]);
|
2017-01-16 14:40:50 -06:00
|
|
|
|
2019-03-18 06:43:10 -05:00
|
|
|
fn is_unit_type(ty: Ty<'_>) -> bool {
|
2020-08-03 17:18:29 -05:00
|
|
|
match ty.kind() {
|
2018-08-22 16:34:52 -05:00
|
|
|
ty::Tuple(slice) => slice.is_empty(),
|
|
|
|
ty::Never => true,
|
2017-01-22 12:36:50 -06:00
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-25 15:41:36 -05:00
|
|
|
fn is_unit_function(cx: &LateContext<'_>, expr: &hir::Expr<'_>) -> bool {
|
2020-07-17 03:47:04 -05:00
|
|
|
let ty = cx.typeck_results().expr_ty(expr);
|
2017-01-16 14:40:50 -06:00
|
|
|
|
2020-08-03 17:18:29 -05:00
|
|
|
if let ty::FnDef(id, _) = *ty.kind() {
|
2018-11-03 12:50:23 -05:00
|
|
|
if let Some(fn_type) = cx.tcx.fn_sig(id).no_bound_vars() {
|
2018-04-09 01:19:40 -05:00
|
|
|
return is_unit_type(fn_type.output());
|
2017-01-16 14:40:50 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
false
|
|
|
|
}
|
|
|
|
|
2020-06-25 15:41:36 -05:00
|
|
|
fn is_unit_expression(cx: &LateContext<'_>, expr: &hir::Expr<'_>) -> bool {
|
2020-07-17 03:47:04 -05:00
|
|
|
is_unit_type(cx.typeck_results().expr_ty(expr))
|
2017-01-22 12:36:50 -06:00
|
|
|
}
|
|
|
|
|
2018-04-09 01:19:40 -05:00
|
|
|
/// The expression inside a closure may or may not have surrounding braces and
|
|
|
|
/// semicolons, which causes problems when generating a suggestion. Given an
|
|
|
|
/// expression that evaluates to '()' or '!', recursively remove useless braces
|
|
|
|
/// and semi-colons until is suitable for including in the suggestion template
|
2020-06-25 15:41:36 -05:00
|
|
|
fn reduce_unit_expression<'a>(cx: &LateContext<'_>, expr: &'a hir::Expr<'_>) -> Option<Span> {
|
2018-04-09 01:19:40 -05:00
|
|
|
if !is_unit_expression(cx, expr) {
|
2017-01-22 12:36:50 -06:00
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
2019-09-27 10:16:06 -05:00
|
|
|
match expr.kind {
|
2020-06-09 16:44:04 -05:00
|
|
|
hir::ExprKind::Call(_, _) | hir::ExprKind::MethodCall(_, _, _, _) => {
|
2017-01-22 12:36:50 -06:00
|
|
|
// Calls can't be reduced any more
|
2017-01-22 15:42:57 -06:00
|
|
|
Some(expr.span)
|
2017-01-22 12:36:50 -06:00
|
|
|
},
|
2018-07-12 02:30:57 -05:00
|
|
|
hir::ExprKind::Block(ref block, _) => {
|
2017-01-22 12:36:50 -06:00
|
|
|
match (&block.stmts[..], block.expr.as_ref()) {
|
|
|
|
(&[], Some(inner_expr)) => {
|
2018-04-15 04:35:20 -05:00
|
|
|
// If block only contains an expression,
|
|
|
|
// reduce `{ X }` to `X`
|
2018-04-09 01:19:40 -05:00
|
|
|
reduce_unit_expression(cx, inner_expr)
|
2017-01-22 12:36:50 -06:00
|
|
|
},
|
|
|
|
(&[ref inner_stmt], None) => {
|
2018-04-15 04:35:20 -05:00
|
|
|
// If block only contains statements,
|
|
|
|
// reduce `{ X; }` to `X` or `X;`
|
2019-09-27 10:16:06 -05:00
|
|
|
match inner_stmt.kind {
|
2019-01-20 04:21:30 -06:00
|
|
|
hir::StmtKind::Local(ref local) => Some(local.span),
|
|
|
|
hir::StmtKind::Expr(ref e) => Some(e.span),
|
|
|
|
hir::StmtKind::Semi(..) => Some(inner_stmt.span),
|
|
|
|
hir::StmtKind::Item(..) => None,
|
2017-01-22 12:36:50 -06:00
|
|
|
}
|
|
|
|
},
|
2018-04-15 04:35:20 -05:00
|
|
|
_ => {
|
|
|
|
// For closures that contain multiple statements
|
|
|
|
// it's difficult to get a correct suggestion span
|
|
|
|
// for all cases (multi-line closures specifically)
|
|
|
|
//
|
|
|
|
// We do not attempt to build a suggestion for those right now.
|
|
|
|
None
|
2018-11-27 14:14:15 -06:00
|
|
|
},
|
2017-01-22 12:36:50 -06:00
|
|
|
}
|
|
|
|
},
|
|
|
|
_ => None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-25 21:55:23 -05:00
|
|
|
fn unit_closure<'tcx>(
|
2020-06-25 15:41:36 -05:00
|
|
|
cx: &LateContext<'tcx>,
|
2020-06-25 21:55:23 -05:00
|
|
|
expr: &hir::Expr<'_>,
|
|
|
|
) -> Option<(&'tcx hir::Param<'tcx>, &'tcx hir::Expr<'tcx>)> {
|
2019-09-27 10:16:06 -05:00
|
|
|
if let hir::ExprKind::Closure(_, ref decl, inner_expr_id, _, _) = expr.kind {
|
2018-12-07 18:56:03 -06:00
|
|
|
let body = cx.tcx.hir().body(inner_expr_id);
|
2017-01-22 19:57:17 -06:00
|
|
|
let body_expr = &body.value;
|
2017-01-22 12:36:50 -06:00
|
|
|
|
2018-04-08 02:48:49 -05:00
|
|
|
if_chain! {
|
|
|
|
if decl.inputs.len() == 1;
|
2018-04-09 01:19:40 -05:00
|
|
|
if is_unit_expression(cx, body_expr);
|
2018-04-08 02:48:49 -05:00
|
|
|
if let Some(binding) = iter_input_pats(&decl, body).next();
|
|
|
|
then {
|
|
|
|
return Some((binding, body_expr));
|
|
|
|
}
|
|
|
|
}
|
2017-01-22 12:36:50 -06:00
|
|
|
}
|
|
|
|
None
|
|
|
|
}
|
|
|
|
|
2018-10-11 17:43:13 -05:00
|
|
|
/// Builds a name for the let binding variable (`var_arg`)
|
2018-04-15 04:37:35 -05:00
|
|
|
///
|
|
|
|
/// `x.field` => `x_field`
|
|
|
|
/// `y` => `_y`
|
|
|
|
///
|
2020-03-08 17:43:40 -05:00
|
|
|
/// Anything else will return `a`.
|
2020-06-25 15:41:36 -05:00
|
|
|
fn let_binding_name(cx: &LateContext<'_>, var_arg: &hir::Expr<'_>) -> String {
|
2019-09-27 10:16:06 -05:00
|
|
|
match &var_arg.kind {
|
2018-07-12 02:30:57 -05:00
|
|
|
hir::ExprKind::Field(_, _) => snippet(cx, var_arg.span, "_").replace(".", "_"),
|
|
|
|
hir::ExprKind::Path(_) => format!("_{}", snippet(cx, var_arg.span, "")),
|
2020-03-08 17:43:40 -05:00
|
|
|
_ => "a".to_string(),
|
2018-04-15 04:37:35 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-09-18 01:37:41 -05:00
|
|
|
#[must_use]
|
2018-04-15 06:00:12 -05:00
|
|
|
fn suggestion_msg(function_type: &str, map_type: &str) -> String {
|
|
|
|
format!(
|
2020-03-08 16:28:06 -05:00
|
|
|
"called `map(f)` on an `{0}` value where `f` is a {1} that returns the unit type",
|
2018-11-27 14:14:15 -06:00
|
|
|
map_type, function_type
|
2018-04-15 06:00:12 -05:00
|
|
|
)
|
|
|
|
}
|
|
|
|
|
2020-06-25 15:41:36 -05:00
|
|
|
fn lint_map_unit_fn(cx: &LateContext<'_>, stmt: &hir::Stmt<'_>, expr: &hir::Expr<'_>, map_args: &[hir::Expr<'_>]) {
|
2017-01-16 14:40:50 -06:00
|
|
|
let var_arg = &map_args[0];
|
|
|
|
|
2020-07-17 03:47:04 -05:00
|
|
|
let (map_type, variant, lint) =
|
|
|
|
if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(var_arg), sym!(option_type)) {
|
|
|
|
("Option", "Some", OPTION_MAP_UNIT_FN)
|
|
|
|
} else if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(var_arg), sym!(result_type)) {
|
|
|
|
("Result", "Ok", RESULT_MAP_UNIT_FN)
|
|
|
|
} else {
|
|
|
|
return;
|
|
|
|
};
|
2018-12-21 23:58:07 -06:00
|
|
|
let fn_arg = &map_args[1];
|
2017-01-16 14:40:50 -06:00
|
|
|
|
2018-04-09 01:19:40 -05:00
|
|
|
if is_unit_function(cx, fn_arg) {
|
2018-04-15 06:00:12 -05:00
|
|
|
let msg = suggestion_msg("function", map_type);
|
2018-11-27 14:14:15 -06:00
|
|
|
let suggestion = format!(
|
2019-09-25 10:49:23 -05:00
|
|
|
"if let {0}({binding}) = {1} {{ {2}({binding}) }}",
|
2018-11-27 14:14:15 -06:00
|
|
|
variant,
|
|
|
|
snippet(cx, var_arg.span, "_"),
|
2019-09-25 10:49:23 -05:00
|
|
|
snippet(cx, fn_arg.span, "_"),
|
|
|
|
binding = let_binding_name(cx, var_arg)
|
2018-11-27 14:14:15 -06:00
|
|
|
);
|
2017-01-16 14:40:50 -06:00
|
|
|
|
2020-04-17 01:08:00 -05:00
|
|
|
span_lint_and_then(cx, lint, expr.span, &msg, |diag| {
|
|
|
|
diag.span_suggestion(stmt.span, "try this", suggestion, Applicability::MachineApplicable);
|
2018-04-15 06:00:12 -05:00
|
|
|
});
|
2018-04-09 01:19:40 -05:00
|
|
|
} else if let Some((binding, closure_expr)) = unit_closure(cx, fn_arg) {
|
2018-04-15 06:00:12 -05:00
|
|
|
let msg = suggestion_msg("closure", map_type);
|
2018-04-15 04:35:20 -05:00
|
|
|
|
2020-04-17 01:08:00 -05:00
|
|
|
span_lint_and_then(cx, lint, expr.span, &msg, |diag| {
|
2018-04-15 08:37:11 -05:00
|
|
|
if let Some(reduced_expr_span) = reduce_unit_expression(cx, closure_expr) {
|
2018-11-27 14:14:15 -06:00
|
|
|
let suggestion = format!(
|
|
|
|
"if let {0}({1}) = {2} {{ {3} }}",
|
|
|
|
variant,
|
|
|
|
snippet(cx, binding.pat.span, "_"),
|
|
|
|
snippet(cx, var_arg.span, "_"),
|
|
|
|
snippet(cx, reduced_expr_span, "_")
|
|
|
|
);
|
2020-04-17 01:08:00 -05:00
|
|
|
diag.span_suggestion(
|
2018-09-18 10:07:54 -05:00
|
|
|
stmt.span,
|
|
|
|
"try this",
|
|
|
|
suggestion,
|
2018-09-18 12:01:17 -05:00
|
|
|
Applicability::MachineApplicable, // snippet
|
2018-09-18 10:07:54 -05:00
|
|
|
);
|
2018-04-15 08:37:11 -05:00
|
|
|
} else {
|
2018-11-27 14:14:15 -06:00
|
|
|
let suggestion = format!(
|
|
|
|
"if let {0}({1}) = {2} {{ ... }}",
|
|
|
|
variant,
|
|
|
|
snippet(cx, binding.pat.span, "_"),
|
2019-09-25 10:49:23 -05:00
|
|
|
snippet(cx, var_arg.span, "_"),
|
2018-09-18 10:07:54 -05:00
|
|
|
);
|
2020-04-17 01:08:00 -05:00
|
|
|
diag.span_suggestion(stmt.span, "try this", suggestion, Applicability::HasPlaceholders);
|
2018-04-15 08:37:11 -05:00
|
|
|
}
|
2018-04-15 04:35:20 -05:00
|
|
|
});
|
2017-01-22 12:36:50 -06:00
|
|
|
}
|
2017-01-16 14:40:50 -06:00
|
|
|
}
|
|
|
|
|
2020-06-25 15:41:36 -05:00
|
|
|
impl<'tcx> LateLintPass<'tcx> for MapUnit {
|
|
|
|
fn check_stmt(&mut self, cx: &LateContext<'_>, stmt: &hir::Stmt<'_>) {
|
2019-08-19 11:30:32 -05:00
|
|
|
if stmt.span.from_expansion() {
|
2017-01-16 14:40:50 -06:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-09-27 10:16:06 -05:00
|
|
|
if let hir::StmtKind::Semi(ref expr) = stmt.kind {
|
2019-05-17 16:53:54 -05:00
|
|
|
if let Some(arglists) = method_chain_args(expr, &["map"]) {
|
2018-09-16 06:07:40 -05:00
|
|
|
lint_map_unit_fn(cx, stmt, expr, arglists[0]);
|
2017-01-16 14:40:50 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|