From b6c20ae41051f59aca076d73571e3349f47a34f0 Mon Sep 17 00:00:00 2001 From: Ian Hobson Date: Fri, 12 May 2023 16:52:06 +0200 Subject: [PATCH] clippy: Remove unnecessary casts --- src/chunks.rs | 8 ++------ src/cue.rs | 16 +++++----------- src/wavereader.rs | 2 +- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/chunks.rs b/src/chunks.rs index 1e78802..f116b0c 100644 --- a/src/chunks.rs +++ b/src/chunks.rs @@ -34,7 +34,7 @@ where T: Write, { fn write_wave_fmt(&mut self, format: &WaveFmt) -> Result<(), ParserError> { - self.write_u16::(format.tag as u16)?; + self.write_u16::(format.tag)?; self.write_u16::(format.channel_count)?; self.write_u32::(format.sample_rate)?; self.write_u32::(format.bytes_per_second)?; @@ -143,11 +143,7 @@ where fn read_bext_string_field(&mut self, length: usize) -> Result { let mut buffer: Vec = vec![0; length]; self.read(&mut buffer)?; - let trimmed: Vec = buffer - .iter() - .take_while(|c| **c != 0 as u8) - .cloned() - .collect(); + let trimmed: Vec = buffer.iter().take_while(|c| **c != 0_u8).cloned().collect(); Ok(ASCII .decode(&trimmed, DecoderTrap::Ignore) .expect("Error decoding text")) diff --git a/src/cue.rs b/src/cue.rs index cb06904..884df4a 100644 --- a/src/cue.rs +++ b/src/cue.rs @@ -69,9 +69,7 @@ struct RawLabel { impl RawLabel { fn write_to(&self) -> Vec { let mut writer = Cursor::new(vec![0u8; 0]); - writer - .write_u32::(self.cue_point_id as u32) - .unwrap(); + writer.write_u32::(self.cue_point_id).unwrap(); writer.write(&self.text).unwrap(); writer.into_inner() } @@ -83,7 +81,7 @@ impl RawLabel { Ok(Self { cue_point_id: rdr.read_u32::()?, text: { - let mut buf = vec![0u8; (length - 4) as usize]; + let mut buf = vec![0u8; length - 4]; rdr.read_exact(&mut buf)?; buf }, @@ -112,7 +110,7 @@ impl RawNote { Ok(Self { cue_point_id: rdr.read_u32::()?, text: { - let mut buf = vec![0u8; (length - 4) as usize]; + let mut buf = vec![0u8; length - 4]; rdr.read_exact(&mut buf)?; buf }, @@ -162,7 +160,7 @@ impl RawLtxt { code_page: rdr.read_u16::()?, text: { if length - 20 > 0 { - let mut buf = vec![0u8; (length - 20) as usize]; + let mut buf = vec![0u8; length - 20]; rdr.read_exact(&mut buf)?; Some(buf) } else { @@ -292,11 +290,7 @@ pub struct Cue { } fn convert_to_cue_string(buffer: &[u8]) -> String { - let trimmed: Vec = buffer - .iter() - .take_while(|c| **c != 0 as u8) - .cloned() - .collect(); + let trimmed: Vec = buffer.iter().take_while(|c| **c != 0_u8).cloned().collect(); ASCII .decode(&trimmed, DecoderTrap::Ignore) .expect("Error decoding text") diff --git a/src/wavereader.rs b/src/wavereader.rs index 9b4e038..18bec67 100644 --- a/src/wavereader.rs +++ b/src/wavereader.rs @@ -607,7 +607,7 @@ impl WaveReader { /// Index of first LIST for with the given FORM fourcc fn get_list_form(&mut self, fourcc: FourCC) -> Result, ParserError> { for (n, (start, _)) in self.get_chunks_extents(LIST_SIG)?.iter().enumerate() { - self.inner.seek(SeekFrom::Start(*start as u64))?; + self.inner.seek(SeekFrom::Start(*start))?; let this_fourcc = self.inner.read_fourcc()?; if this_fourcc == fourcc { return Ok(Some(n as u32));