-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add
needless_character_iteration
lint
- Loading branch information
1 parent
caad063
commit 1fa6ea2
Showing
9 changed files
with
217 additions
and
18 deletions.
There are no files selected for viewing
This file contains 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 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 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 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,79 @@ | ||
use rustc_errors::Applicability; | ||
use rustc_hir::{Closure, Expr, ExprKind, HirId, UnOp}; | ||
use rustc_lint::LateContext; | ||
use rustc_middle::ty; | ||
use rustc_span::Span; | ||
|
||
use super::utils::get_last_chain_binding_hir_id; | ||
use super::NEEDLESS_CHARACTER_ITERATION; | ||
use clippy_utils::diagnostics::span_lint_and_sugg; | ||
use clippy_utils::source::snippet_opt; | ||
use clippy_utils::{path_to_local_id, peel_blocks}; | ||
|
||
fn handle_expr( | ||
cx: &LateContext<'_>, | ||
expr: &Expr<'_>, | ||
first_param: HirId, | ||
span: Span, | ||
before_chars: Span, | ||
revert: bool, | ||
) { | ||
match expr.kind { | ||
ExprKind::MethodCall(method, receiver, [], _) => { | ||
if method.ident.name.as_str() == "is_ascii" | ||
&& path_to_local_id(receiver, first_param) | ||
&& let char_arg_ty = cx.typeck_results().expr_ty_adjusted(receiver).peel_refs() | ||
&& *char_arg_ty.kind() == ty::Char | ||
&& let Some(snippet) = snippet_opt(cx, before_chars) | ||
{ | ||
span_lint_and_sugg( | ||
cx, | ||
NEEDLESS_CHARACTER_ITERATION, | ||
span, | ||
"checking if a string is ascii using iterators", | ||
"try", | ||
format!("{}{snippet}.is_ascii()", if revert { "!" } else { "" }), | ||
Applicability::MachineApplicable, | ||
); | ||
} | ||
}, | ||
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, block.stmts) | ||
{ | ||
handle_expr(cx, &block_expr, last_chain_binding_id, span, before_chars, revert); | ||
} | ||
}, | ||
ExprKind::Unary(UnOp::Not, expr) => handle_expr(cx, expr, first_param, span, before_chars, !revert), | ||
_ => {}, | ||
} | ||
} | ||
|
||
pub(super) fn check(cx: &LateContext<'_>, call_expr: &Expr<'_>, recv: &Expr<'_>, closure_arg: &Expr<'_>) { | ||
if let ExprKind::Closure(&Closure { body, .. }) = closure_arg.kind | ||
&& let body = cx.tcx.hir().body(body) | ||
&& let Some(first_param) = body.params.first() | ||
&& let ExprKind::MethodCall(method, mut recv, [], _) = recv.kind | ||
&& method.ident.name.as_str() == "chars" | ||
&& let str_ty = cx.typeck_results().expr_ty_adjusted(recv).peel_refs() | ||
&& *str_ty.kind() == ty::Str | ||
{ | ||
let expr_start = recv.span; | ||
while let ExprKind::MethodCall(_, new_recv, _, _) = recv.kind { | ||
recv = new_recv; | ||
} | ||
let body_expr = peel_blocks(body.value); | ||
|
||
handle_expr( | ||
cx, | ||
&body_expr, | ||
first_param.pat.hir_id, | ||
recv.span.with_hi(call_expr.span.hi()), | ||
recv.span.with_hi(expr_start.hi()), | ||
false, | ||
); | ||
} | ||
} |
This file contains 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 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 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,18 @@ | ||
#![warn(clippy::needless_character_iteration)] | ||
#![allow(clippy::unnecessary_operation)] | ||
|
||
fn main() { | ||
"foo".is_ascii(); | ||
//~^ ERROR: checking if a string is ascii using iterators | ||
!"foo".is_ascii(); | ||
//~^ ERROR: checking if a string is ascii using iterators | ||
|
||
let s = String::new(); | ||
s.is_ascii(); | ||
//~^ ERROR: checking if a string is ascii using iterators | ||
!"foo".to_string().is_ascii(); | ||
//~^ ERROR: checking if a string is ascii using iterators | ||
|
||
"foo".is_ascii(); | ||
!"foo".is_ascii(); | ||
} |
This file contains 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,26 @@ | ||
#![warn(clippy::needless_character_iteration)] | ||
#![allow(clippy::unnecessary_operation)] | ||
|
||
fn main() { | ||
"foo".chars().all(|c| c.is_ascii()); | ||
//~^ ERROR: checking if a string is ascii using iterators | ||
"foo".chars().all(|c| !c.is_ascii()); | ||
//~^ ERROR: checking if a string is ascii using iterators | ||
|
||
let s = String::new(); | ||
s.chars().all(|c| c.is_ascii()); | ||
//~^ ERROR: checking if a string is ascii using iterators | ||
"foo".to_string().chars().all(|c| !c.is_ascii()); | ||
//~^ ERROR: checking if a string is ascii using iterators | ||
|
||
"foo".chars().all(|c| { | ||
//~^ ERROR: checking if a string is ascii using iterators | ||
let x = c; | ||
x.is_ascii() | ||
}); | ||
"foo".chars().all(|c| { | ||
//~^ ERROR: checking if a string is ascii using iterators | ||
let x = c; | ||
!x.is_ascii() | ||
}); | ||
} |
This file contains 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,49 @@ | ||
error: checking if a string is ascii using iterators | ||
--> tests/ui/needless_character_iteration.rs:5:5 | ||
| | ||
LL | "foo".chars().all(|c| c.is_ascii()); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `"foo".is_ascii()` | ||
| | ||
= note: `-D clippy::needless-character-iteration` implied by `-D warnings` | ||
= help: to override `-D warnings` add `#[allow(clippy::needless_character_iteration)]` | ||
|
||
error: checking if a string is ascii using iterators | ||
--> tests/ui/needless_character_iteration.rs:7:5 | ||
| | ||
LL | "foo".chars().all(|c| !c.is_ascii()); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `!"foo".is_ascii()` | ||
|
||
error: checking if a string is ascii using iterators | ||
--> tests/ui/needless_character_iteration.rs:11:5 | ||
| | ||
LL | s.chars().all(|c| c.is_ascii()); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `s.is_ascii()` | ||
|
||
error: checking if a string is ascii using iterators | ||
--> tests/ui/needless_character_iteration.rs:13:5 | ||
| | ||
LL | "foo".to_string().chars().all(|c| !c.is_ascii()); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `!"foo".to_string().is_ascii()` | ||
|
||
error: checking if a string is ascii using iterators | ||
--> tests/ui/needless_character_iteration.rs:16:5 | ||
| | ||
LL | / "foo".chars().all(|c| { | ||
LL | | | ||
LL | | let x = c; | ||
LL | | x.is_ascii() | ||
LL | | }); | ||
| |______^ help: try: `"foo".is_ascii()` | ||
|
||
error: checking if a string is ascii using iterators | ||
--> tests/ui/needless_character_iteration.rs:21:5 | ||
| | ||
LL | / "foo".chars().all(|c| { | ||
LL | | | ||
LL | | let x = c; | ||
LL | | !x.is_ascii() | ||
LL | | }); | ||
| |______^ help: try: `!"foo".is_ascii()` | ||
|
||
error: aborting due to 6 previous errors | ||
|