-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Add lint unnecessary_option_map_or_else #14662
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
pnuts93
wants to merge
1
commit into
rust-lang:master
Choose a base branch
from
pnuts93:issue-14588-fix
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+308
−65
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
clippy_lints/src/methods/unnecessary_option_map_or_else.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| use clippy_utils::diagnostics::span_lint_and_sugg; | ||
| use clippy_utils::peel_blocks; | ||
| use clippy_utils::source::snippet; | ||
| use clippy_utils::ty::is_type_diagnostic_item; | ||
| use rustc_errors::Applicability; | ||
| use rustc_hir::{Closure, Expr, ExprKind, HirId, QPath}; | ||
| use rustc_lint::LateContext; | ||
| use rustc_span::symbol::sym; | ||
|
|
||
| use super::UNNECESSARY_OPTION_MAP_OR_ELSE; | ||
| use super::utils::get_last_chain_binding_hir_id; | ||
|
|
||
| fn emit_lint(cx: &LateContext<'_>, expr: &Expr<'_>, recv: &Expr<'_>, def_arg: &Expr<'_>) { | ||
| let msg = "unused \"map closure\" when calling `Option::map_or_else` value"; | ||
| let self_snippet = snippet(cx, recv.span, ".."); | ||
| let err_snippet = snippet(cx, def_arg.span, ".."); | ||
| span_lint_and_sugg( | ||
| cx, | ||
| UNNECESSARY_OPTION_MAP_OR_ELSE, | ||
| expr.span, | ||
| msg, | ||
| "consider using `unwrap_or_else`", | ||
| format!("{self_snippet}.unwrap_or_else({err_snippet})"), | ||
| Applicability::MachineApplicable, | ||
| ); | ||
| } | ||
|
|
||
| fn handle_qpath( | ||
| cx: &LateContext<'_>, | ||
| expr: &Expr<'_>, | ||
| recv: &Expr<'_>, | ||
| def_arg: &Expr<'_>, | ||
| expected_hir_id: HirId, | ||
| qpath: QPath<'_>, | ||
| ) { | ||
| if let QPath::Resolved(_, path) = qpath | ||
| && let rustc_hir::def::Res::Local(hir_id) = path.res | ||
| && expected_hir_id == hir_id | ||
| { | ||
| emit_lint(cx, expr, recv, def_arg); | ||
| } | ||
| } | ||
|
|
||
| /// lint use of `_.map_or_else(|err| err, |n| n)` for `Option`s. | ||
| pub(super) fn check(cx: &LateContext<'_>, expr: &Expr<'_>, recv: &Expr<'_>, def_arg: &Expr<'_>, map_arg: &Expr<'_>) { | ||
| // lint if the caller of `map_or_else()` is an `Option` | ||
| if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(recv), sym::Option) | ||
| && let ExprKind::Closure(&Closure { body, .. }) = map_arg.kind | ||
| && let body = cx.tcx.hir_body(body) | ||
| && let Some(first_param) = body.params.first() | ||
| { | ||
| let body_expr = peel_blocks(body.value); | ||
|
|
||
| match body_expr.kind { | ||
| ExprKind::Path(qpath) => { | ||
| handle_qpath(cx, expr, recv, def_arg, first_param.pat.hir_id, qpath); | ||
| }, | ||
| // If this is a block (that wasn't peeled off), then it means there are statements. | ||
| ExprKind::Block(block, _) => { | ||
| if let Some(block_expr) = block.expr | ||
| // First we ensure that this is a "binding chain" (each statement is a binding | ||
| // of the previous one) and that it is a binding of the closure argument. | ||
| && let Some(last_chain_binding_id) = | ||
| get_last_chain_binding_hir_id(first_param.pat.hir_id, block.stmts) | ||
| && let ExprKind::Path(qpath) = block_expr.kind | ||
| { | ||
| handle_qpath(cx, expr, recv, def_arg, last_chain_binding_id, qpath); | ||
| } | ||
| }, | ||
| _ => {}, | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should use
snippet_with_applicabilityinstead here. Also the default forself_snippetshould be"_", not"..".