clippy: Avoid making unnecessary references

This commit is contained in:
Ian Hobson
2023-05-12 16:52:06 +02:00
parent 566ad07247
commit 651009c96a
3 changed files with 10 additions and 12 deletions

View File

@@ -298,7 +298,7 @@ fn convert_to_cue_string(buffer: &[u8]) -> String {
fn convert_from_cue_string(val: &str) -> Vec<u8> { fn convert_from_cue_string(val: &str) -> Vec<u8> {
ASCII ASCII
.encode(&val, EncoderTrap::Ignore) .encode(val, EncoderTrap::Ignore)
.expect("Error encoding text") .expect("Error encoding text")
} }
@@ -319,12 +319,12 @@ impl Cue {
let raw_label = cue.label.as_ref().map(|val| RawLabel { let raw_label = cue.label.as_ref().map(|val| RawLabel {
cue_point_id: n as u32, 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 { let raw_note = cue.note.as_ref().map(|val| RawNote {
cue_point_id: n as u32, 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 { let raw_ltxt = cue.length.map(|val| RawLtxt {

View File

@@ -579,15 +579,13 @@ impl<R: Read + Seek> WaveReader<R> {
&mut self, &mut self,
ident: FourCC, ident: FourCC,
at: u32, at: u32,
mut buffer: &mut Vec<u8>, buffer: &mut Vec<u8>,
) -> Result<usize, ParserError> { ) -> Result<usize, ParserError> {
match self.get_chunk_extent_at_index(ident, at) { match self.get_chunk_extent_at_index(ident, at) {
Ok((start, length)) => { Ok((start, length)) => {
buffer.resize(length as usize, 0x0); buffer.resize(length as usize, 0x0);
self.inner.seek(SeekFrom::Start(start))?; self.inner.seek(SeekFrom::Start(start))?;
self.inner self.inner.read(buffer).map_err(|e| ParserError::IOError(e))
.read(&mut buffer)
.map_err(|e| ParserError::IOError(e))
} }
Err(ParserError::ChunkMissing { signature: _ }) => Ok(0), Err(ParserError::ChunkMissing { signature: _ }) => Ok(0),
Err(any) => Err(any), Err(any) => Err(any),

View File

@@ -38,7 +38,7 @@ where
from_frames.len() % self.inner.inner.format.channel_count as usize == 0, from_frames.len() % self.inner.inner.format.channel_count as usize == 0,
"frames buffer does not contain a number of samples % channel_count == 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 .format
.create_raw_buffer(buffer.len() / self.inner.inner.format.channel_count as usize); .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.write(&write_buffer)?;
self.inner.flush()?; self.inner.flush()?;
@@ -317,7 +317,7 @@ where
pub fn write_broadcast_metadata(&mut self, bext: &Bext) -> Result<(), Error> { pub fn write_broadcast_metadata(&mut self, bext: &Bext) -> Result<(), Error> {
//FIXME Implement re-writing //FIXME Implement re-writing
let mut c = Cursor::new(vec![0u8; 0]); let mut c = Cursor::new(vec![0u8; 0]);
c.write_bext(&bext)?; c.write_bext(bext)?;
let buf = c.into_inner(); let buf = c.into_inner();
self.write_chunk(BEXT_SIG, &buf)?; self.write_chunk(BEXT_SIG, &buf)?;
Ok(()) Ok(())
@@ -326,13 +326,13 @@ where
/// Write iXML metadata /// Write iXML metadata
pub fn write_ixml(&mut self, ixml: &[u8]) -> Result<(), Error> { pub fn write_ixml(&mut self, ixml: &[u8]) -> Result<(), Error> {
//FIXME Implement re-writing //FIXME Implement re-writing
self.write_chunk(IXML_SIG, &ixml) self.write_chunk(IXML_SIG, ixml)
} }
/// Write axml/ADM metadata /// Write axml/ADM metadata
pub fn write_axml(&mut self, axml: &[u8]) -> Result<(), Error> { pub fn write_axml(&mut self, axml: &[u8]) -> Result<(), Error> {
//FIXME Implement re-writing //FIXME Implement re-writing
self.write_chunk(AXML_SIG, &axml) self.write_chunk(AXML_SIG, axml)
} }
/// Write a `JUNK` filler chunk /// Write a `JUNK` filler chunk