From fae69a0859817aab680a44e2d276f66c30bf0306 Mon Sep 17 00:00:00 2001 From: Denys Zadorozhnyi Date: Wed, 13 Nov 2024 10:51:24 +0200 Subject: [PATCH] chore: fix clippy warnings --- assembly/src/library/namespace.rs | 2 +- assembly/src/library/path.rs | 4 ++-- assembly/src/parser/scanner.rs | 2 +- assembly/src/parser/token.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assembly/src/library/namespace.rs b/assembly/src/library/namespace.rs index 4a0510618c..529718264c 100644 --- a/assembly/src/library/namespace.rs +++ b/assembly/src/library/namespace.rs @@ -112,7 +112,7 @@ impl LibraryNamespace { if matches!(source, Self::KERNEL_PATH | Self::EXEC_PATH | Self::ANON_PATH) { return Ok(()); } - if source.as_bytes().len() > Self::MAX_LENGTH { + if source.len() > Self::MAX_LENGTH { return Err(LibraryNamespaceError::Length); } if !source.starts_with(|c: char| c.is_ascii_lowercase() && c.is_ascii_alphabetic()) { diff --git a/assembly/src/library/path.rs b/assembly/src/library/path.rs index 8175339dd2..915bc9aaad 100644 --- a/assembly/src/library/path.rs +++ b/assembly/src/library/path.rs @@ -192,8 +192,8 @@ impl LibraryPath { /// Return the size in bytes of this path when displayed as a string pub fn byte_len(&self) -> usize { - self.inner.components.iter().map(|c| c.as_bytes().len()).sum::() - + self.inner.ns.as_str().as_bytes().len() + self.inner.components.iter().map(|c| c.len()).sum::() + + self.inner.ns.as_str().len() + (self.inner.components.len() * 2) } diff --git a/assembly/src/parser/scanner.rs b/assembly/src/parser/scanner.rs index dc90470fa3..c95414374e 100644 --- a/assembly/src/parser/scanner.rs +++ b/assembly/src/parser/scanner.rs @@ -41,7 +41,7 @@ pub struct Scanner<'input> { impl<'input> Scanner<'input> { /// Construct a new [Scanner] for the given `source`. pub fn new(input: &'input str) -> Self { - let end = input.as_bytes().len(); + let end = input.len(); assert!(end < u32::MAX as usize, "file too large"); let mut chars = input.char_indices().peekable(); diff --git a/assembly/src/parser/token.rs b/assembly/src/parser/token.rs index 602e274912..b55201f1a7 100644 --- a/assembly/src/parser/token.rs +++ b/assembly/src/parser/token.rs @@ -860,7 +860,7 @@ impl<'input> Token<'input> { // No match, it's an ident None => Token::Ident(s), // If the match is not exact, it's an ident - Some(matched) if matched.len() != s.as_bytes().len() => Token::Ident(s), + Some(matched) if matched.len() != s.len() => Token::Ident(s), // Otherwise clone the Token corresponding to the keyword that was matched Some(matched) => Self::KEYWORDS[matched.pattern().as_usize()].1.clone(), }