From 939f3f2f0d76c83f2f0ada8ff9c90f258a9c3231 Mon Sep 17 00:00:00 2001 From: Serial <69764315+Serial-ATA@users.noreply.github.com> Date: Tue, 27 Dec 2022 13:41:53 -0500 Subject: [PATCH] Clippy: Fix `manual_is_ascii_check` --- src/id3/v2/frame/id.rs | 4 ++-- src/id3/v2/items/language_frame.rs | 2 +- src/id3/v2/items/sync_text.rs | 5 +---- src/iff/wav/tag/read.rs | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/id3/v2/frame/id.rs b/src/id3/v2/frame/id.rs index 6157b71c..b732decd 100644 --- a/src/id3/v2/frame/id.rs +++ b/src/id3/v2/frame/id.rs @@ -41,7 +41,7 @@ impl FrameID { pub(crate) fn verify_id(id_str: &str) -> Result<()> { for c in id_str.chars() { - if !('A'..='Z').contains(&c) && !('0'..='9').contains(&c) { + if !c.is_ascii_uppercase() && !c.is_ascii_digit() { return Err(ID3v2Error::new(ID3v2ErrorKind::BadFrameID).into()); } } @@ -59,7 +59,7 @@ impl TryFrom<&ItemKey> for FrameID { if unknown.len() == 4 && unknown .chars() - .all(|c| ('A'..='Z').contains(&c) || ('0'..='9').contains(&c)) => + .all(|c| c.is_ascii_uppercase() || c.is_ascii_digit()) => { Ok(Self::Valid(unknown.clone())) }, diff --git a/src/id3/v2/items/language_frame.rs b/src/id3/v2/items/language_frame.rs index 31d10dc9..55586337 100644 --- a/src/id3/v2/items/language_frame.rs +++ b/src/id3/v2/items/language_frame.rs @@ -42,7 +42,7 @@ impl LanguageFrame { pub fn as_bytes(&self) -> Result> { let mut bytes = vec![self.encoding as u8]; - if self.language.len() != 3 || self.language.iter().any(|c| !(b'a'..=b'z').contains(&c)) { + if self.language.len() != 3 || self.language.iter().any(|c| !c.is_ascii_lowercase()) { return Err(ID3v2Error::new(ID3v2ErrorKind::Other( "Invalid frame language found (expected 3 ascii characters)", )) diff --git a/src/id3/v2/items/sync_text.rs b/src/id3/v2/items/sync_text.rs index 5e95b480..6a7e42f1 100644 --- a/src/id3/v2/items/sync_text.rs +++ b/src/id3/v2/items/sync_text.rs @@ -192,10 +192,7 @@ impl SynchronizedText { let mut data = vec![information.encoding as u8]; if information.language.len() == 3 - && information - .language - .chars() - .all(|c| ('a'..='z').contains(&c)) + && information.language.chars().all(|c| c.is_ascii_lowercase()) { data.write_all(information.language.as_bytes())?; data.write_u8(information.timestamp_format as u8)?; diff --git a/src/iff/wav/tag/read.rs b/src/iff/wav/tag/read.rs index e3cec4c2..c10be61d 100644 --- a/src/iff/wav/tag/read.rs +++ b/src/iff/wav/tag/read.rs @@ -39,5 +39,5 @@ pub(super) fn verify_key(key: &str) -> bool { key.len() == 4 && key .chars() - .all(|c| ('A'..='Z').contains(&c) || ('0'..='9').contains(&c)) + .all(|c| c.is_ascii_uppercase() || c.is_ascii_digit()) }