From 91b34c91272bc4c9c00f87a3d0efe12ae87d3071 Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Fri, 14 Jun 2024 11:13:20 +0000 Subject: [PATCH] Make Clippy happy --- core/src/offset_calculator/impls.rs | 10 +++++----- frameworks/src/generic_visitor.rs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/offset_calculator/impls.rs b/core/src/offset_calculator/impls.rs index 679c6ee6..702492eb 100644 --- a/core/src/offset_calculator/impls.rs +++ b/core/src/offset_calculator/impls.rs @@ -102,7 +102,7 @@ impl<'original> CachingOffsetCalculator<'original> { let suffix = chars.collect::(); self.offset += suffix.as_bytes().len() + 1; - self.ascii &= suffix.chars().all(|ch| ch.is_ascii()); + self.ascii &= suffix.is_ascii(); self.line_column.line += 1; self.line_column.column = 0; @@ -117,7 +117,7 @@ impl<'original> CachingOffsetCalculator<'original> { let line = self.lines.next().unwrap(); self.offset += line.as_bytes().len() + 1; - self.ascii &= line.chars().all(|ch| ch.is_ascii()); + self.ascii &= line.is_ascii(); self.line_column.line += 1; self.line_column.column = 0; @@ -133,7 +133,7 @@ impl<'original> CachingOffsetCalculator<'original> { fn char_offset(chars: &mut Chars<'_>, column: usize) -> (String, usize, bool) { let prefix = chars.take(column).collect::(); let offset = prefix.as_bytes().len(); - let ascii = prefix.chars().all(|ch| ch.is_ascii()); + let ascii = prefix.is_ascii(); (prefix, offset, ascii) } } @@ -151,7 +151,7 @@ impl<'original> Interface for StatelessOffsetCalculator<'original> { for _ in 1..line_column.line { let line = lines.next().unwrap(); offset += line.as_bytes().len() + 1; - ascii &= line.chars().all(|ch| ch.is_ascii()); + ascii &= line.is_ascii(); } let prefix = lines @@ -161,7 +161,7 @@ impl<'original> Interface for StatelessOffsetCalculator<'original> { .take(line_column.column) .collect::(); offset += prefix.as_bytes().len(); - ascii &= prefix.chars().all(|ch| ch.is_ascii()); + ascii &= prefix.is_ascii(); (offset, ascii) } diff --git a/frameworks/src/generic_visitor.rs b/frameworks/src/generic_visitor.rs index a633dbc6..27cef583 100644 --- a/frameworks/src/generic_visitor.rs +++ b/frameworks/src/generic_visitor.rs @@ -8,7 +8,7 @@ use necessist_core::{ use paste::paste; use std::{cell::RefCell, collections::BTreeSet}; -pub struct GenericVisitor<'context, 'config, 'framework, 'ast, T: ParseLow + ?Sized> { +pub struct GenericVisitor<'context, 'config, 'framework, 'ast, T: ParseLow> { pub context: &'context LightContext<'context>, pub config: &'config config::Compiled, pub framework: &'framework mut T,