2021-03-25 18:29:11 +00:00
|
|
|
use clippy_utils::diagnostics::span_lint_and_sugg;
|
2021-08-08 14:49:13 +00:00
|
|
|
use clippy_utils::higher;
|
2021-03-25 18:29:11 +00:00
|
|
|
use clippy_utils::source::snippet_with_applicability;
|
|
|
|
use clippy_utils::sugg::Sugg;
|
|
|
|
use clippy_utils::ty::is_type_diagnostic_item;
|
2021-11-29 14:34:36 +00:00
|
|
|
use clippy_utils::{eq_expr_value, is_lang_ctor, path_to_local, path_to_local_id, peel_blocks, peel_blocks_with_stmt};
|
2018-11-27 20:14:15 +00:00
|
|
|
use if_chain::if_chain;
|
2019-01-31 01:15:29 +00:00
|
|
|
use rustc_errors::Applicability;
|
2021-10-19 10:26:50 +00:00
|
|
|
use rustc_hir::LangItem::{OptionNone, OptionSome, ResultOk};
|
2021-11-29 14:34:36 +00:00
|
|
|
use rustc_hir::{BindingAnnotation, Expr, ExprKind, PatKind};
|
2020-01-12 06:08:41 +00:00
|
|
|
use rustc_lint::{LateContext, LateLintPass};
|
2020-01-11 11:37:08 +00:00
|
|
|
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
2020-11-05 13:29:48 +00:00
|
|
|
use rustc_span::sym;
|
2018-01-28 00:04:22 +00:00
|
|
|
|
2018-11-27 20:14:15 +00:00
|
|
|
declare_clippy_lint! {
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### What it does
|
|
|
|
/// Checks for expressions that could be replaced by the question mark operator.
|
2019-03-05 16:50:33 +00:00
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Why is this bad?
|
|
|
|
/// Question mark usage is more idiomatic.
|
2019-03-05 16:50:33 +00:00
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Example
|
2019-03-05 22:23:50 +00:00
|
|
|
/// ```ignore
|
2019-03-05 16:50:33 +00:00
|
|
|
/// if option.is_none() {
|
|
|
|
/// return None;
|
|
|
|
/// }
|
|
|
|
/// ```
|
|
|
|
///
|
|
|
|
/// Could be written:
|
|
|
|
///
|
2019-03-05 22:23:50 +00:00
|
|
|
/// ```ignore
|
2019-03-05 16:50:33 +00:00
|
|
|
/// option?;
|
|
|
|
/// ```
|
Added `clippy::version` attribute to all normal lints
So, some context for this, well, more a story. I'm not used to scripting, I've never really scripted anything, even if it's a valuable skill. I just never really needed it. Now, `@flip1995` correctly suggested using a script for this in `rust-clippy#7813`...
And I decided to write a script using nushell because why not? This was a mistake... I spend way more time on this than I would like to admit. It has definitely been more than 4 hours. It shouldn't take that long, but me being new to scripting and nushell just wasn't a good mixture... Anyway, here is the script that creates another script which adds the versions. Fun...
Just execute this on the `gh-pages` branch and the resulting `replacer.sh` in `clippy_lints` and it should all work.
```nu
mv v0.0.212 rust-1.00.0;
mv beta rust-1.57.0;
mv master rust-1.58.0;
let paths = (open ./rust-1.58.0/lints.json | select id id_span | flatten | select id path);
let versions = (
ls | where name =~ "rust-" | select name | format {name}/lints.json |
each { open $it | select id | insert version $it | str substring "5,11" version} |
group-by id | rotate counter-clockwise id version |
update version {get version | first 1} | flatten | select id version);
$paths | each { |row|
let version = ($versions | where id == ($row.id) | format {version})
let idu = ($row.id | str upcase)
$"sed -i '0,/($idu),/{s/pub ($idu),/#[clippy::version = "($version)"]\n pub ($idu),/}' ($row.path)"
} | str collect ";" | str find-replace --all '1.00.0' 'pre 1.29.0' | save "replacer.sh";
```
And this still has some problems, but at this point I just want to be done -.-
2021-10-21 19:06:26 +00:00
|
|
|
#[clippy::version = "pre 1.29.0"]
|
2018-01-28 00:04:22 +00:00
|
|
|
pub QUESTION_MARK,
|
2018-03-28 13:24:26 +00:00
|
|
|
style,
|
2018-01-28 00:04:22 +00:00
|
|
|
"checks for expressions that could be replaced by the question mark operator"
|
|
|
|
}
|
|
|
|
|
2019-04-08 20:43:55 +00:00
|
|
|
declare_lint_pass!(QuestionMark => [QUESTION_MARK]);
|
2018-01-28 00:04:22 +00:00
|
|
|
|
2019-04-08 20:43:55 +00:00
|
|
|
impl QuestionMark {
|
2019-01-31 01:15:29 +00:00
|
|
|
/// Checks if the given expression on the given context matches the following structure:
|
2018-01-28 00:04:22 +00:00
|
|
|
///
|
2018-06-25 19:22:53 +00:00
|
|
|
/// ```ignore
|
2018-01-28 00:04:22 +00:00
|
|
|
/// if option.is_none() {
|
2019-03-10 17:19:47 +00:00
|
|
|
/// return None;
|
2018-01-28 00:04:22 +00:00
|
|
|
/// }
|
|
|
|
/// ```
|
|
|
|
///
|
2021-10-19 10:26:50 +00:00
|
|
|
/// ```ignore
|
|
|
|
/// if result.is_err() {
|
|
|
|
/// return result;
|
|
|
|
/// }
|
|
|
|
/// ```
|
|
|
|
///
|
2018-01-28 00:04:22 +00:00
|
|
|
/// If it matches, it will suggest to use the question mark operator instead
|
2021-10-19 10:26:50 +00:00
|
|
|
fn check_is_none_or_err_and_early_return(cx: &LateContext<'_>, expr: &Expr<'_>) {
|
2018-01-28 00:04:22 +00:00
|
|
|
if_chain! {
|
2021-08-08 14:49:13 +00:00
|
|
|
if let Some(higher::If { cond, then, r#else }) = higher::If::hir(expr);
|
|
|
|
if let ExprKind::MethodCall(segment, _, args, _) = &cond.kind;
|
2018-01-28 00:04:22 +00:00
|
|
|
if let Some(subject) = args.get(0);
|
2021-10-20 05:41:44 +00:00
|
|
|
if (Self::option_check_and_early_return(cx, subject, then) && segment.ident.name == sym!(is_none)) ||
|
|
|
|
(Self::result_check_and_early_return(cx, subject, then) && segment.ident.name == sym!(is_err));
|
2018-01-28 00:04:22 +00:00
|
|
|
then {
|
2020-03-04 08:21:07 +00:00
|
|
|
let mut applicability = Applicability::MachineApplicable;
|
2020-03-04 12:59:58 +00:00
|
|
|
let receiver_str = &Sugg::hir_with_applicability(cx, subject, "..", &mut applicability);
|
2018-12-19 19:55:01 +00:00
|
|
|
let mut replacement: Option<String> = None;
|
2021-08-08 14:49:13 +00:00
|
|
|
if let Some(else_inner) = r#else {
|
2021-11-29 14:34:36 +00:00
|
|
|
if eq_expr_value(cx, subject, peel_blocks(else_inner)) {
|
|
|
|
replacement = Some(format!("Some({}?)", receiver_str));
|
2018-12-12 08:46:52 +00:00
|
|
|
}
|
2020-04-17 04:09:02 +00:00
|
|
|
} else if Self::moves_by_default(cx, subject)
|
|
|
|
&& !matches!(subject.kind, ExprKind::Call(..) | ExprKind::MethodCall(..))
|
|
|
|
{
|
|
|
|
replacement = Some(format!("{}.as_ref()?;", receiver_str));
|
2018-12-18 10:25:13 +00:00
|
|
|
} else {
|
2020-04-17 04:09:02 +00:00
|
|
|
replacement = Some(format!("{}?;", receiver_str));
|
2018-12-12 08:46:52 +00:00
|
|
|
}
|
2018-12-19 19:55:01 +00:00
|
|
|
|
|
|
|
if let Some(replacement_str) = replacement {
|
2020-03-04 12:59:58 +00:00
|
|
|
span_lint_and_sugg(
|
2018-12-19 19:55:01 +00:00
|
|
|
cx,
|
|
|
|
QUESTION_MARK,
|
|
|
|
expr.span,
|
|
|
|
"this block may be rewritten with the `?` operator",
|
2020-03-04 12:59:58 +00:00
|
|
|
"replace it with",
|
|
|
|
replacement_str,
|
|
|
|
applicability,
|
2021-06-03 06:41:37 +00:00
|
|
|
);
|
2020-06-09 14:36:01 +00:00
|
|
|
}
|
2018-01-28 00:04:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-10-19 10:26:50 +00:00
|
|
|
fn check_if_let_some_or_err_and_early_return(cx: &LateContext<'_>, expr: &Expr<'_>) {
|
2020-03-04 07:59:16 +00:00
|
|
|
if_chain! {
|
2021-09-08 14:31:47 +00:00
|
|
|
if let Some(higher::IfLet { let_pat, let_expr, if_then, if_else: Some(if_else) })
|
|
|
|
= higher::IfLet::hir(cx, expr);
|
2021-08-08 14:49:13 +00:00
|
|
|
if let PatKind::TupleStruct(ref path1, fields, None) = let_pat.kind;
|
2021-10-20 05:41:44 +00:00
|
|
|
if (Self::option_check_and_early_return(cx, let_expr, if_else) && is_lang_ctor(cx, path1, OptionSome)) ||
|
|
|
|
(Self::result_check_and_early_return(cx, let_expr, if_else) && is_lang_ctor(cx, path1, ResultOk));
|
2021-10-19 10:26:50 +00:00
|
|
|
|
2021-04-22 09:31:13 +00:00
|
|
|
if let PatKind::Binding(annot, bind_id, _, _) = fields[0].kind;
|
2020-03-04 07:59:16 +00:00
|
|
|
let by_ref = matches!(annot, BindingAnnotation::Ref | BindingAnnotation::RefMut);
|
2021-11-29 14:34:36 +00:00
|
|
|
if path_to_local_id(peel_blocks(if_then), bind_id);
|
2020-03-04 07:59:16 +00:00
|
|
|
then {
|
|
|
|
let mut applicability = Applicability::MachineApplicable;
|
2021-08-08 14:49:13 +00:00
|
|
|
let receiver_str = snippet_with_applicability(cx, let_expr.span, "..", &mut applicability);
|
2021-10-19 10:26:50 +00:00
|
|
|
let replacement = format!("{}{}?", receiver_str, if by_ref { ".as_ref()" } else { "" },);
|
2020-03-04 07:59:16 +00:00
|
|
|
|
2020-03-04 12:59:58 +00:00
|
|
|
span_lint_and_sugg(
|
2020-03-04 07:59:16 +00:00
|
|
|
cx,
|
|
|
|
QUESTION_MARK,
|
|
|
|
expr.span,
|
|
|
|
"this if-let-else may be rewritten with the `?` operator",
|
2020-03-04 12:59:58 +00:00
|
|
|
"replace it with",
|
|
|
|
replacement,
|
|
|
|
applicability,
|
2021-06-03 06:41:37 +00:00
|
|
|
);
|
2020-03-04 07:59:16 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-10-20 05:41:44 +00:00
|
|
|
fn result_check_and_early_return(cx: &LateContext<'_>, expr: &Expr<'_>, nested_expr: &Expr<'_>) -> bool {
|
|
|
|
Self::is_result(cx, expr) && Self::expression_returns_unmodified_err(cx, nested_expr, expr)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn option_check_and_early_return(cx: &LateContext<'_>, expr: &Expr<'_>, nested_expr: &Expr<'_>) -> bool {
|
|
|
|
Self::is_option(cx, expr) && Self::expression_returns_none(cx, nested_expr)
|
|
|
|
}
|
|
|
|
|
2020-06-25 20:41:36 +00:00
|
|
|
fn moves_by_default(cx: &LateContext<'_>, expression: &Expr<'_>) -> bool {
|
2020-07-17 08:47:04 +00:00
|
|
|
let expr_ty = cx.typeck_results().expr_ty(expression);
|
2018-12-18 12:55:04 +00:00
|
|
|
|
2020-06-21 09:20:48 +00:00
|
|
|
!expr_ty.is_copy_modulo_regions(cx.tcx.at(expression.span), cx.param_env)
|
2018-12-18 12:55:04 +00:00
|
|
|
}
|
|
|
|
|
2020-06-25 20:41:36 +00:00
|
|
|
fn is_option(cx: &LateContext<'_>, expression: &Expr<'_>) -> bool {
|
2020-07-17 08:47:04 +00:00
|
|
|
let expr_ty = cx.typeck_results().expr_ty(expression);
|
2018-01-28 00:04:22 +00:00
|
|
|
|
2021-10-02 23:51:01 +00:00
|
|
|
is_type_diagnostic_item(cx, expr_ty, sym::Option)
|
2018-01-28 00:04:22 +00:00
|
|
|
}
|
|
|
|
|
2021-10-19 10:26:50 +00:00
|
|
|
fn is_result(cx: &LateContext<'_>, expression: &Expr<'_>) -> bool {
|
|
|
|
let expr_ty = cx.typeck_results().expr_ty(expression);
|
|
|
|
|
|
|
|
is_type_diagnostic_item(cx, expr_ty, sym::Result)
|
|
|
|
}
|
|
|
|
|
2020-06-25 20:41:36 +00:00
|
|
|
fn expression_returns_none(cx: &LateContext<'_>, expression: &Expr<'_>) -> bool {
|
2021-11-29 14:34:36 +00:00
|
|
|
match peel_blocks_with_stmt(expression).kind {
|
2021-04-08 15:50:13 +00:00
|
|
|
ExprKind::Ret(Some(expr)) => Self::expression_returns_none(cx, expr),
|
2021-04-22 09:31:13 +00:00
|
|
|
ExprKind::Path(ref qpath) => is_lang_ctor(cx, qpath, OptionNone),
|
2018-11-27 20:14:15 +00:00
|
|
|
_ => false,
|
2018-01-28 00:04:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-10-26 13:22:22 +00:00
|
|
|
fn expression_returns_unmodified_err(cx: &LateContext<'_>, expr: &Expr<'_>, cond_expr: &Expr<'_>) -> bool {
|
2021-11-29 14:34:36 +00:00
|
|
|
match peel_blocks_with_stmt(expr).kind {
|
2021-10-26 13:22:22 +00:00
|
|
|
ExprKind::Ret(Some(ret_expr)) => Self::expression_returns_unmodified_err(cx, ret_expr, cond_expr),
|
2021-12-06 09:18:17 +00:00
|
|
|
ExprKind::Path(_) => path_to_local(expr).is_some() && path_to_local(expr) == path_to_local(cond_expr),
|
2021-10-19 10:26:50 +00:00
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
2018-01-28 00:04:22 +00:00
|
|
|
}
|
|
|
|
|
2020-06-25 20:41:36 +00:00
|
|
|
impl<'tcx> LateLintPass<'tcx> for QuestionMark {
|
|
|
|
fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
|
2021-10-19 10:26:50 +00:00
|
|
|
Self::check_is_none_or_err_and_early_return(cx, expr);
|
|
|
|
Self::check_if_let_some_or_err_and_early_return(cx, expr);
|
2018-01-28 00:04:22 +00:00
|
|
|
}
|
|
|
|
}
|