2021-06-03 01:41:37 -05:00
|
|
|
use clippy_utils::consts::constant_simple;
|
2021-03-25 13:29:11 -05:00
|
|
|
use clippy_utils::diagnostics::span_lint_and_sugg;
|
|
|
|
use clippy_utils::source::{indent_of, reindent_multiline, snippet_opt};
|
|
|
|
use clippy_utils::ty::is_type_diagnostic_item;
|
|
|
|
use clippy_utils::usage::contains_return_break_continue_macro;
|
2021-04-22 04:31:13 -05:00
|
|
|
use clippy_utils::{in_constant, is_lang_ctor, path_to_local_id, sugg};
|
2020-10-23 15:16:59 -05:00
|
|
|
use if_chain::if_chain;
|
|
|
|
use rustc_errors::Applicability;
|
2021-04-22 04:31:13 -05:00
|
|
|
use rustc_hir::LangItem::{OptionNone, OptionSome, ResultErr, ResultOk};
|
|
|
|
use rustc_hir::{Arm, Expr, ExprKind, PatKind};
|
2020-10-23 15:16:59 -05:00
|
|
|
use rustc_lint::LintContext;
|
|
|
|
use rustc_lint::{LateContext, LateLintPass};
|
|
|
|
use rustc_middle::lint::in_external_macro;
|
|
|
|
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
2020-11-05 07:29:48 -06:00
|
|
|
use rustc_span::sym;
|
2020-10-23 15:16:59 -05:00
|
|
|
|
|
|
|
declare_clippy_lint! {
|
2021-07-29 05:16:06 -05:00
|
|
|
/// ### What it does
|
2020-10-28 17:36:07 -05:00
|
|
|
/// Finds patterns that reimplement `Option::unwrap_or` or `Result::unwrap_or`.
|
2020-10-23 15:16:59 -05:00
|
|
|
///
|
2021-07-29 05:16:06 -05:00
|
|
|
/// ### Why is this bad?
|
2020-10-23 15:16:59 -05:00
|
|
|
/// Concise code helps focusing on behavior instead of boilerplate.
|
|
|
|
///
|
2021-07-29 05:16:06 -05:00
|
|
|
/// ### Example
|
2020-10-23 15:16:59 -05:00
|
|
|
/// ```rust
|
|
|
|
/// let foo: Option<i32> = None;
|
|
|
|
/// match foo {
|
|
|
|
/// Some(v) => v,
|
|
|
|
/// None => 1,
|
|
|
|
/// };
|
|
|
|
/// ```
|
|
|
|
///
|
|
|
|
/// Use instead:
|
|
|
|
/// ```rust
|
|
|
|
/// let foo: Option<i32> = None;
|
|
|
|
/// foo.unwrap_or(1);
|
|
|
|
/// ```
|
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 14:06:26 -05:00
|
|
|
#[clippy::version = "1.49.0"]
|
2020-10-23 15:16:59 -05:00
|
|
|
pub MANUAL_UNWRAP_OR,
|
|
|
|
complexity,
|
2020-10-28 17:36:07 -05:00
|
|
|
"finds patterns that can be encoded more concisely with `Option::unwrap_or` or `Result::unwrap_or`"
|
2020-10-23 15:16:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
declare_lint_pass!(ManualUnwrapOr => [MANUAL_UNWRAP_OR]);
|
|
|
|
|
2022-01-11 09:52:23 -06:00
|
|
|
impl<'tcx> LateLintPass<'tcx> for ManualUnwrapOr {
|
2020-10-23 15:16:59 -05:00
|
|
|
fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
|
2021-03-25 13:29:11 -05:00
|
|
|
if in_external_macro(cx.sess(), expr.span) || in_constant(cx, expr.hir_id) {
|
2020-10-23 15:16:59 -05:00
|
|
|
return;
|
|
|
|
}
|
2020-10-28 17:36:07 -05:00
|
|
|
lint_manual_unwrap_or(cx, expr);
|
2020-10-23 15:16:59 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-10-28 17:36:07 -05:00
|
|
|
fn lint_manual_unwrap_or<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
|
2021-04-22 04:31:13 -05:00
|
|
|
fn applicable_or_arm<'a>(cx: &LateContext<'_>, arms: &'a [Arm<'a>]) -> Option<&'a Arm<'a>> {
|
2020-10-23 15:16:59 -05:00
|
|
|
if_chain! {
|
|
|
|
if arms.len() == 2;
|
|
|
|
if arms.iter().all(|arm| arm.guard.is_none());
|
2021-04-22 04:31:13 -05:00
|
|
|
if let Some((idx, or_arm)) = arms.iter().enumerate().find(|(_, arm)| {
|
2020-10-28 17:36:07 -05:00
|
|
|
match arm.pat.kind {
|
2021-04-22 04:31:13 -05:00
|
|
|
PatKind::Path(ref qpath) => is_lang_ctor(cx, qpath, OptionNone),
|
2021-07-14 16:17:04 -05:00
|
|
|
PatKind::TupleStruct(ref qpath, [pat], _) =>
|
2021-04-22 04:31:13 -05:00
|
|
|
matches!(pat.kind, PatKind::Wild) && is_lang_ctor(cx, qpath, ResultErr),
|
2020-10-28 17:36:07 -05:00
|
|
|
_ => false,
|
2020-10-23 15:16:59 -05:00
|
|
|
}
|
2021-04-22 04:31:13 -05:00
|
|
|
});
|
2020-10-28 17:36:07 -05:00
|
|
|
let unwrap_arm = &arms[1 - idx];
|
2021-07-14 16:17:04 -05:00
|
|
|
if let PatKind::TupleStruct(ref qpath, [unwrap_pat], _) = unwrap_arm.pat.kind;
|
2021-04-22 04:31:13 -05:00
|
|
|
if is_lang_ctor(cx, qpath, OptionSome) || is_lang_ctor(cx, qpath, ResultOk);
|
2020-10-28 17:36:07 -05:00
|
|
|
if let PatKind::Binding(_, binding_hir_id, ..) = unwrap_pat.kind;
|
2021-02-11 08:04:38 -06:00
|
|
|
if path_to_local_id(unwrap_arm.body, binding_hir_id);
|
2021-05-20 05:30:31 -05:00
|
|
|
if cx.typeck_results().expr_adjustments(unwrap_arm.body).is_empty();
|
2021-03-25 13:29:11 -05:00
|
|
|
if !contains_return_break_continue_macro(or_arm.body);
|
2020-10-23 15:16:59 -05:00
|
|
|
then {
|
2020-10-28 17:36:07 -05:00
|
|
|
Some(or_arm)
|
2020-10-23 15:16:59 -05:00
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if_chain! {
|
|
|
|
if let ExprKind::Match(scrutinee, match_arms, _) = expr.kind;
|
|
|
|
let ty = cx.typeck_results().expr_ty(scrutinee);
|
2021-10-02 18:51:01 -05:00
|
|
|
if let Some(ty_name) = if is_type_diagnostic_item(cx, ty, sym::Option) {
|
2021-05-20 05:30:31 -05:00
|
|
|
Some("Option")
|
2021-10-02 18:51:01 -05:00
|
|
|
} else if is_type_diagnostic_item(cx, ty, sym::Result) {
|
2021-05-20 05:30:31 -05:00
|
|
|
Some("Result")
|
2020-10-28 17:36:07 -05:00
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
2021-04-22 04:31:13 -05:00
|
|
|
if let Some(or_arm) = applicable_or_arm(cx, match_arms);
|
2021-03-25 13:29:11 -05:00
|
|
|
if let Some(or_body_snippet) = snippet_opt(cx, or_arm.body.span);
|
|
|
|
if let Some(indent) = indent_of(cx, expr.span);
|
2020-10-28 17:36:07 -05:00
|
|
|
if constant_simple(cx, cx.typeck_results(), or_arm.body).is_some();
|
2020-10-23 15:16:59 -05:00
|
|
|
then {
|
2020-10-28 17:36:07 -05:00
|
|
|
let reindented_or_body =
|
2021-03-25 13:29:11 -05:00
|
|
|
reindent_multiline(or_body_snippet.into(), true, Some(indent));
|
2021-04-27 09:55:11 -05:00
|
|
|
|
|
|
|
let suggestion = if scrutinee.span.from_expansion() {
|
2021-10-17 05:04:01 -05:00
|
|
|
// we don't want parentheses around macro, e.g. `(some_macro!()).unwrap_or(0)`
|
2021-04-27 09:55:11 -05:00
|
|
|
sugg::Sugg::hir_with_macro_callsite(cx, scrutinee, "..")
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
sugg::Sugg::hir(cx, scrutinee, "..").maybe_par()
|
|
|
|
};
|
|
|
|
|
2021-03-25 13:29:11 -05:00
|
|
|
span_lint_and_sugg(
|
2020-10-23 15:16:59 -05:00
|
|
|
cx,
|
|
|
|
MANUAL_UNWRAP_OR, expr.span,
|
2021-05-20 05:30:31 -05:00
|
|
|
&format!("this pattern reimplements `{}::unwrap_or`", ty_name),
|
2020-10-23 15:16:59 -05:00
|
|
|
"replace with",
|
|
|
|
format!(
|
|
|
|
"{}.unwrap_or({})",
|
2021-04-27 09:55:11 -05:00
|
|
|
suggestion,
|
2020-10-28 17:36:07 -05:00
|
|
|
reindented_or_body,
|
2020-10-23 15:16:59 -05:00
|
|
|
),
|
|
|
|
Applicability::MachineApplicable,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|