Skip to content

Commit 7206e9a

Browse files
committed
Enable iter_on_empty_collections
1 parent 1bf4600 commit 7206e9a

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

clippy_dev/src/utils.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,8 @@ impl<'txt> RustSearcher<'txt> {
488488

489489
/// Consumes the next token if it matches the requested value and captures the value if
490490
/// requested. Returns true if a token was matched.
491-
fn read_token(&mut self, token: Token<'_>, captures: &mut slice::IterMut<'_, &mut &'txt str>) -> bool {
491+
fn read_token(&mut self, token: Token<'_>, captures: &mut [&mut &'txt str]) -> bool {
492+
let mut captures = captures.iter_mut();
492493
loop {
493494
match (token, self.next_token.kind) {
494495
(_, lexer::TokenKind::Whitespace)
@@ -552,8 +553,7 @@ impl<'txt> RustSearcher<'txt> {
552553

553554
#[must_use]
554555
pub fn find_token(&mut self, token: Token<'_>) -> bool {
555-
let mut capture = [].iter_mut();
556-
while !self.read_token(token, &mut capture) {
556+
while !self.read_token(token, &mut []) {
557557
self.step();
558558
if self.at_end() {
559559
return false;
@@ -566,8 +566,8 @@ impl<'txt> RustSearcher<'txt> {
566566
pub fn find_capture_token(&mut self, token: Token<'_>) -> Option<&'txt str> {
567567
let mut res = "";
568568
let mut capture = &mut res;
569-
let mut capture = slice::from_mut(&mut capture).iter_mut();
570-
while !self.read_token(token, &mut capture) {
569+
let capture = slice::from_mut(&mut capture);
570+
while !self.read_token(token, capture) {
571571
self.step();
572572
if self.at_end() {
573573
return None;
@@ -578,8 +578,7 @@ impl<'txt> RustSearcher<'txt> {
578578

579579
#[must_use]
580580
pub fn match_tokens(&mut self, tokens: &[Token<'_>], captures: &mut [&mut &'txt str]) -> bool {
581-
let mut captures = captures.iter_mut();
582-
tokens.iter().all(|&t| self.read_token(t, &mut captures))
581+
tokens.iter().all(|&t| self.read_token(t, captures))
583582
}
584583
}
585584

tests/dogfood.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ fn run_clippy_for_package(project: &str) -> bool {
9696
"-D",
9797
"clippy::derive_partial_eq_without_eq",
9898
"-D",
99+
"clippy::iter_on_empty_collections",
100+
"-D",
99101
"clippy::iter_on_single_items",
100102
"-D",
101103
"clippy::needless_pass_by_ref_mut",

0 commit comments

Comments
 (0)