jamie/bwavfile
1
0
Fork 0
mirror of https://github.com/iluvcapra/bwavfile.git synced 2025-12-31 08:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

clippy: Remove unnecessary casts

Browse Source
This commit is contained in:
Ian Hobson
2023-05-12 16:52:06 +02:00
parent 9eb655cd27
commit b6c20ae410
3 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/chunks.rs
View File

@@ -34,7 +34,7 @@ where
T: Write, T: Write,
{ {
fn write_wave_fmt(&mut self, format: &WaveFmt) -> Result<(), ParserError> { fn write_wave_fmt(&mut self, format: &WaveFmt) -> Result<(), ParserError> {
self.write_u16::<LittleEndian>(format.tag as u16)?; self.write_u16::<LittleEndian>(format.tag)?;
self.write_u16::<LittleEndian>(format.channel_count)?; self.write_u16::<LittleEndian>(format.channel_count)?;
self.write_u32::<LittleEndian>(format.sample_rate)?; self.write_u32::<LittleEndian>(format.sample_rate)?;
self.write_u32::<LittleEndian>(format.bytes_per_second)?; self.write_u32::<LittleEndian>(format.bytes_per_second)?;
@@ -143,11 +143,7 @@ where
fn read_bext_string_field(&mut self, length: usize) -> Result<String, ParserError> { fn read_bext_string_field(&mut self, length: usize) -> Result<String, ParserError> {
let mut buffer: Vec<u8> = vec![0; length]; let mut buffer: Vec<u8> = vec![0; length];
self.read(&mut buffer)?; self.read(&mut buffer)?;
let trimmed: Vec<u8> = buffer let trimmed: Vec<u8> = buffer.iter().take_while(|c| **c != 0_u8).cloned().collect();
.iter()
.take_while(|c| **c != 0 as u8)
.cloned()
.collect();
Ok(ASCII Ok(ASCII
.decode(&trimmed, DecoderTrap::Ignore) .decode(&trimmed, DecoderTrap::Ignore)
.expect("Error decoding text")) .expect("Error decoding text"))

16
src/cue.rs
View File

@@ -69,9 +69,7 @@ struct RawLabel {
impl RawLabel { impl RawLabel {
fn write_to(&self) -> Vec<u8> { fn write_to(&self) -> Vec<u8> {
let mut writer = Cursor::new(vec![0u8; 0]); let mut writer = Cursor::new(vec![0u8; 0]);
writer writer.write_u32::<LittleEndian>(self.cue_point_id).unwrap();
.write_u32::<LittleEndian>(self.cue_point_id as u32)
.unwrap();
writer.write(&self.text).unwrap(); writer.write(&self.text).unwrap();
writer.into_inner() writer.into_inner()
} }
@@ -83,7 +81,7 @@ impl RawLabel {
Ok(Self { Ok(Self {
cue_point_id: rdr.read_u32::<LittleEndian>()?, cue_point_id: rdr.read_u32::<LittleEndian>()?,
text: { text: {
let mut buf = vec![0u8; (length - 4) as usize]; let mut buf = vec![0u8; length - 4];
rdr.read_exact(&mut buf)?; rdr.read_exact(&mut buf)?;
buf buf
}, },
@@ -112,7 +110,7 @@ impl RawNote {
Ok(Self { Ok(Self {
cue_point_id: rdr.read_u32::<LittleEndian>()?, cue_point_id: rdr.read_u32::<LittleEndian>()?,
text: { text: {
let mut buf = vec![0u8; (length - 4) as usize]; let mut buf = vec![0u8; length - 4];
rdr.read_exact(&mut buf)?; rdr.read_exact(&mut buf)?;
buf buf
}, },
@@ -162,7 +160,7 @@ impl RawLtxt {
code_page: rdr.read_u16::<LittleEndian>()?, code_page: rdr.read_u16::<LittleEndian>()?,
text: { text: {
if length - 20 > 0 { 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)?; rdr.read_exact(&mut buf)?;
Some(buf) Some(buf)
} else { } else {
@@ -292,11 +290,7 @@ pub struct Cue {
} }
fn convert_to_cue_string(buffer: &[u8]) -> String { fn convert_to_cue_string(buffer: &[u8]) -> String {
let trimmed: Vec<u8> = buffer let trimmed: Vec<u8> = buffer.iter().take_while(|c| **c != 0_u8).cloned().collect();
.iter()
.take_while(|c| **c != 0 as u8)
.cloned()
.collect();
ASCII ASCII
.decode(&trimmed, DecoderTrap::Ignore) .decode(&trimmed, DecoderTrap::Ignore)
.expect("Error decoding text") .expect("Error decoding text")

2
src/wavereader.rs
View File

@@ -607,7 +607,7 @@ impl<R: Read + Seek> WaveReader<R> {
/// Index of first LIST for with the given FORM fourcc /// Index of first LIST for with the given FORM fourcc
fn get_list_form(&mut self, fourcc: FourCC) -> Result<Option<u32>, ParserError> { fn get_list_form(&mut self, fourcc: FourCC) -> Result<Option<u32>, ParserError> {
for (n, (start, _)) in self.get_chunks_extents(LIST_SIG)?.iter().enumerate() { 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()?; let this_fourcc = self.inner.read_fourcc()?;
if this_fourcc == fourcc { if this_fourcc == fourcc {
return Ok(Some(n as u32)); return Ok(Some(n as u32));