From 651009c96ae41ad6db43a570ecdbdfa085fc07ef Mon Sep 17 00:00:00 2001 From: Ian Hobson Date: Fri, 12 May 2023 16:52:06 +0200 Subject: [PATCH] clippy: Avoid making unnecessary references --- src/cue.rs | 6 +++--- src/wavereader.rs | 6 ++---- src/wavewriter.rs | 10 +++++----- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/cue.rs b/src/cue.rs index 884df4a..da61478 100644 --- a/src/cue.rs +++ b/src/cue.rs @@ -298,7 +298,7 @@ fn convert_to_cue_string(buffer: &[u8]) -> String { fn convert_from_cue_string(val: &str) -> Vec { ASCII - .encode(&val, EncoderTrap::Ignore) + .encode(val, EncoderTrap::Ignore) .expect("Error encoding text") } @@ -319,12 +319,12 @@ impl Cue { let raw_label = cue.label.as_ref().map(|val| RawLabel { cue_point_id: n as u32, - text: convert_from_cue_string(&val), + text: convert_from_cue_string(val), }); let raw_note = cue.note.as_ref().map(|val| RawNote { cue_point_id: n as u32, - text: convert_from_cue_string(&val), + text: convert_from_cue_string(val), }); let raw_ltxt = cue.length.map(|val| RawLtxt { diff --git a/src/wavereader.rs b/src/wavereader.rs index d64b65c..92af0f3 100644 --- a/src/wavereader.rs +++ b/src/wavereader.rs @@ -579,15 +579,13 @@ impl WaveReader { &mut self, ident: FourCC, at: u32, - mut buffer: &mut Vec, + buffer: &mut Vec, ) -> Result { match self.get_chunk_extent_at_index(ident, at) { Ok((start, length)) => { buffer.resize(length as usize, 0x0); self.inner.seek(SeekFrom::Start(start))?; - self.inner - .read(&mut buffer) - .map_err(|e| ParserError::IOError(e)) + self.inner.read(buffer).map_err(|e| ParserError::IOError(e)) } Err(ParserError::ChunkMissing { signature: _ }) => Ok(0), Err(any) => Err(any), diff --git a/src/wavewriter.rs b/src/wavewriter.rs index 0e97103..949053a 100644 --- a/src/wavewriter.rs +++ b/src/wavewriter.rs @@ -38,7 +38,7 @@ where from_frames.len() % self.inner.inner.format.channel_count as usize == 0, "frames buffer does not contain a number of samples % channel_count == 0" ); - self.inner.inner.format.pack_frames(&from_frames, to_buffer); + self.inner.inner.format.pack_frames(from_frames, to_buffer); () } @@ -55,7 +55,7 @@ where .format .create_raw_buffer(buffer.len() / self.inner.inner.format.channel_count as usize); - self.write_integer_frames_to_buffer(&buffer, &mut write_buffer); + self.write_integer_frames_to_buffer(buffer, &mut write_buffer); self.inner.write(&write_buffer)?; self.inner.flush()?; @@ -317,7 +317,7 @@ where pub fn write_broadcast_metadata(&mut self, bext: &Bext) -> Result<(), Error> { //FIXME Implement re-writing let mut c = Cursor::new(vec![0u8; 0]); - c.write_bext(&bext)?; + c.write_bext(bext)?; let buf = c.into_inner(); self.write_chunk(BEXT_SIG, &buf)?; Ok(()) @@ -326,13 +326,13 @@ where /// Write iXML metadata pub fn write_ixml(&mut self, ixml: &[u8]) -> Result<(), Error> { //FIXME Implement re-writing - self.write_chunk(IXML_SIG, &ixml) + self.write_chunk(IXML_SIG, ixml) } /// Write axml/ADM metadata pub fn write_axml(&mut self, axml: &[u8]) -> Result<(), Error> { //FIXME Implement re-writing - self.write_chunk(AXML_SIG, &axml) + self.write_chunk(AXML_SIG, axml) } /// Write a `JUNK` filler chunk