Don't lint iter_nth_zero in next

This commit is contained in:
Centri3 2023-06-20 00:39:22 -05:00 committed by Catherine
parent 89294e1756
commit 242807a9c1
5 changed files with 54 additions and 23 deletions

View file

@ -20,9 +20,9 @@ pub(super) fn check<'tcx>(
let caller_type = if derefs_to_slice(cx, iter_recv, cx.typeck_results().expr_ty(iter_recv)).is_some() {
"slice"
} else if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(iter_recv), sym::Vec) {
"Vec"
"`Vec`"
} else if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(iter_recv), sym::VecDeque) {
"VecDeque"
"`VecDeque`"
} else {
iter_nth_zero::check(cx, expr, nth_recv, nth_arg);
return; // caller is not a type that we want to lint

View file

@ -1,8 +1,8 @@
use clippy_utils::consts::{constant, Constant};
use clippy_utils::diagnostics::span_lint_and_sugg;
use clippy_utils::is_trait_method;
use clippy_utils::source::snippet_with_applicability;
use if_chain::if_chain;
use clippy_utils::{is_lang_item_or_ctor, is_trait_method};
use hir::{LangItem, OwnerNode};
use rustc_errors::Applicability;
use rustc_hir as hir;
use rustc_lint::LateContext;
@ -11,20 +11,21 @@ use rustc_span::sym;
use super::ITER_NTH_ZERO;
pub(super) fn check(cx: &LateContext<'_>, expr: &hir::Expr<'_>, recv: &hir::Expr<'_>, arg: &hir::Expr<'_>) {
if_chain! {
if is_trait_method(cx, expr, sym::Iterator);
if let Some(Constant::Int(0)) = constant(cx, cx.typeck_results(), arg);
then {
let mut applicability = Applicability::MachineApplicable;
if let OwnerNode::Item(item) = cx.tcx.hir().owner(cx.tcx.hir().get_parent_item(expr.hir_id))
&& let def_id = item.owner_id.to_def_id()
&& is_trait_method(cx, expr, sym::Iterator)
&& let Some(Constant::Int(0)) = constant(cx, cx.typeck_results(), arg)
&& !is_lang_item_or_ctor(cx, def_id, LangItem::IteratorNext)
{
let mut app = Applicability::MachineApplicable;
span_lint_and_sugg(
cx,
ITER_NTH_ZERO,
expr.span,
"called `.nth(0)` on a `std::iter::Iterator`, when `.next()` is equivalent",
"try calling `.next()` instead of `.nth(0)`",
format!("{}.next()", snippet_with_applicability(cx, recv.span, "..", &mut applicability)),
applicability,
format!("{}.next()", snippet_with_applicability(cx, recv.span, "..", &mut app)),
app,
);
}
}
}

View file

@ -1,4 +1,4 @@
error: called `.iter().nth()` on a Vec
error: called `.iter().nth()` on a `Vec`
--> $DIR/iter_nth.rs:34:23
|
LL | let bad_vec = some_vec.iter().nth(3);
@ -23,7 +23,7 @@ LL | let bad_boxed_slice = boxed_slice.iter().nth(3);
|
= help: calling `.get()` is both faster and more readable
error: called `.iter().nth()` on a VecDeque
error: called `.iter().nth()` on a `VecDeque`
--> $DIR/iter_nth.rs:37:29
|
LL | let bad_vec_deque = some_vec_deque.iter().nth(3);
@ -31,7 +31,7 @@ LL | let bad_vec_deque = some_vec_deque.iter().nth(3);
|
= help: calling `.get()` is both faster and more readable
error: called `.iter_mut().nth()` on a Vec
error: called `.iter_mut().nth()` on a `Vec`
--> $DIR/iter_nth.rs:42:23
|
LL | let bad_vec = some_vec.iter_mut().nth(3);
@ -47,7 +47,7 @@ LL | let bad_slice = &some_vec[..].iter_mut().nth(3);
|
= help: calling `.get_mut()` is both faster and more readable
error: called `.iter_mut().nth()` on a VecDeque
error: called `.iter_mut().nth()` on a `VecDeque`
--> $DIR/iter_nth.rs:48:29
|
LL | let bad_vec_deque = some_vec_deque.iter_mut().nth(3);

View file

@ -29,3 +29,18 @@ fn main() {
let mut iter2 = s3.iter();
let _unwrapped = iter2.next().unwrap();
}
struct Issue9820;
impl Iterator for Issue9820 {
type Item = ();
fn nth(&mut self, _n: usize) -> Option<Self::Item> {
todo!()
}
// Don't lint in implementations of `next`, as calling `next` in `next` is incorrect
fn next(&mut self) -> Option<Self::Item> {
self.nth(0)
}
}

View file

@ -29,3 +29,18 @@ fn main() {
let mut iter2 = s3.iter();
let _unwrapped = iter2.nth(0).unwrap();
}
struct Issue9820;
impl Iterator for Issue9820 {
type Item = ();
fn nth(&mut self, _n: usize) -> Option<Self::Item> {
todo!()
}
// Don't lint in implementations of `next`, as calling `next` in `next` is incorrect
fn next(&mut self) -> Option<Self::Item> {
self.nth(0)
}
}