From ac26e9427a9f7252d281a9ad7325d0ab5bfdff1e Mon Sep 17 00:00:00 2001 From: ChanTsune <41658782+ChanTsune@users.noreply.github.com> Date: Thu, 14 Nov 2024 23:27:58 +0900 Subject: [PATCH] :recycle: Simplify code --- lib/src/archive/write.rs | 32 +++++++++++---------------- lib/src/chunk/write.rs | 7 +----- lib/src/entry.rs | 47 ++++++++++++++++------------------------ 3 files changed, 33 insertions(+), 53 deletions(-) diff --git a/lib/src/archive/write.rs b/lib/src/archive/write.rs index 3b931fb58..4e45a34d0 100644 --- a/lib/src/archive/write.rs +++ b/lib/src/archive/write.rs @@ -89,7 +89,7 @@ impl Archive { #[inline] fn write_header_with(mut write: W, header: ArchiveHeader) -> io::Result { write.write_all(PNA_HEADER)?; - (ChunkType::AHED, header.to_bytes().as_slice()).write_chunk_in(&mut write)?; + (ChunkType::AHED, header.to_bytes()).write_chunk_in(&mut write)?; Ok(Self::new(write, header)) } @@ -134,16 +134,13 @@ impl Archive { ); (ChunkType::FHED, header.to_bytes()).write_chunk_in(&mut self.inner)?; if let Some(c) = metadata.created { - (ChunkType::cTIM, c.as_secs().to_be_bytes().as_slice()) - .write_chunk_in(&mut self.inner)?; + (ChunkType::cTIM, c.as_secs().to_be_bytes()).write_chunk_in(&mut self.inner)?; } if let Some(m) = metadata.modified { - (ChunkType::mTIM, m.as_secs().to_be_bytes().as_slice()) - .write_chunk_in(&mut self.inner)?; + (ChunkType::mTIM, m.as_secs().to_be_bytes()).write_chunk_in(&mut self.inner)?; } if let Some(a) = metadata.accessed { - (ChunkType::aTIM, a.as_secs().to_be_bytes().as_slice()) - .write_chunk_in(&mut self.inner)?; + (ChunkType::aTIM, a.as_secs().to_be_bytes()).write_chunk_in(&mut self.inner)?; } if let Some(p) = metadata.permission { (ChunkType::fPRM, p.to_bytes()).write_chunk_in(&mut self.inner)?; @@ -233,7 +230,7 @@ impl Archive { fn add_next_archive_marker(&mut self) -> io::Result { let mut chunk_writer = ChunkWriter::from(&mut self.inner); - chunk_writer.write_chunk((ChunkType::ANXT, [].as_slice())) + chunk_writer.write_chunk((ChunkType::ANXT, [])) } /// Split to the next archive. @@ -289,7 +286,7 @@ impl Archive { #[inline] pub fn finalize(mut self) -> io::Result { let mut chunk_writer = ChunkWriter::from(&mut self.inner); - chunk_writer.write_chunk((ChunkType::AEND, [].as_slice()))?; + chunk_writer.write_chunk((ChunkType::AEND, []))?; Ok(self.inner) } } @@ -309,7 +306,7 @@ impl Archive { write.write_all(PNA_HEADER).await?; let mut chunk_writer = ChunkWriter::from(&mut write); chunk_writer - .write_chunk_async((ChunkType::AHED, header.to_bytes().as_slice())) + .write_chunk_async((ChunkType::AHED, header.to_bytes())) .await?; Ok(Self::new(write, header)) } @@ -330,7 +327,7 @@ impl Archive { pub async fn finalize_async(mut self) -> io::Result { let mut chunk_writer = ChunkWriter::from(&mut self.inner); chunk_writer - .write_chunk_async((ChunkType::AEND, [].as_slice())) + .write_chunk_async((ChunkType::AEND, [])) .await?; Ok(self.inner) } @@ -382,7 +379,7 @@ impl Archive { ); let context = get_writer_context(option)?; - (ChunkType::SHED, header.to_bytes().as_slice()).write_chunk_in(&mut self.inner)?; + (ChunkType::SHED, header.to_bytes()).write_chunk_in(&mut self.inner)?; if let Some(WriteCipher { context: c, .. }) = &context.cipher { (ChunkType::PHSF, c.phsf.as_bytes()).write_chunk_in(&mut self.inner)?; (ChunkType::SDAT, c.iv.as_slice()).write_chunk_in(&mut self.inner)?; @@ -466,16 +463,13 @@ impl SolidArchive { ); (ChunkType::FHED, header.to_bytes()).write_chunk_in(&mut self.inner)?; if let Some(c) = metadata.created { - (ChunkType::cTIM, c.as_secs().to_be_bytes().as_slice()) - .write_chunk_in(&mut self.inner)?; + (ChunkType::cTIM, c.as_secs().to_be_bytes()).write_chunk_in(&mut self.inner)?; } if let Some(m) = metadata.modified { - (ChunkType::mTIM, m.as_secs().to_be_bytes().as_slice()) - .write_chunk_in(&mut self.inner)?; + (ChunkType::mTIM, m.as_secs().to_be_bytes()).write_chunk_in(&mut self.inner)?; } if let Some(a) = metadata.accessed { - (ChunkType::aTIM, a.as_secs().to_be_bytes().as_slice()) - .write_chunk_in(&mut self.inner)?; + (ChunkType::aTIM, a.as_secs().to_be_bytes()).write_chunk_in(&mut self.inner)?; } if let Some(p) = metadata.permission { (ChunkType::fPRM, p.to_bytes()).write_chunk_in(&mut self.inner)?; @@ -527,7 +521,7 @@ impl SolidArchive { fn finalize_solid_entry(mut self) -> io::Result> { self.inner.flush()?; let mut inner = self.inner.try_into_inner()?.try_into_inner()?.into_inner(); - (ChunkType::SEND, [].as_slice()).write_chunk_in(&mut inner)?; + (ChunkType::SEND, []).write_chunk_in(&mut inner)?; Ok(Archive::new(inner, self.archive_header)) } } diff --git a/lib/src/chunk/write.rs b/lib/src/chunk/write.rs index 288129896..1e1c6646d 100644 --- a/lib/src/chunk/write.rs +++ b/lib/src/chunk/write.rs @@ -82,12 +82,7 @@ mod tests { #[test] fn write_aend_chunk() { let mut chunk_writer = ChunkWriter::from(Vec::new()); - assert_eq!( - chunk_writer - .write_chunk((ChunkType::AEND, [].as_slice())) - .unwrap(), - 12 - ); + assert_eq!(chunk_writer.write_chunk((ChunkType::AEND, [])).unwrap(), 12); assert_eq!( chunk_writer.w, [0, 0, 0, 0, 65, 69, 78, 68, 107, 246, 72, 109] diff --git a/lib/src/entry.rs b/lib/src/entry.rs index e1b88a283..ba06ef6ab 100644 --- a/lib/src/entry.rs +++ b/lib/src/entry.rs @@ -300,7 +300,7 @@ impl SealedEntryExt for SolidEntry> { fn write_in(&self, writer: &mut W) -> io::Result { let mut total = 0; - total += (ChunkType::SHED, self.header.to_bytes().as_slice()).write_chunk_in(writer)?; + total += (ChunkType::SHED, self.header.to_bytes()).write_chunk_in(writer)?; for extra_chunk in &self.extra { total += extra_chunk.write_chunk_in(writer)?; } @@ -308,9 +308,9 @@ impl SealedEntryExt for SolidEntry> { total += (ChunkType::PHSF, phsf.as_bytes()).write_chunk_in(writer)?; } for data in &self.data { - total += (ChunkType::SDAT, data.as_slice()).write_chunk_in(writer)?; + total += (ChunkType::SDAT, data).write_chunk_in(writer)?; } - total += (ChunkType::SEND, [].as_slice()).write_chunk_in(writer)?; + total += (ChunkType::SEND, []).write_chunk_in(writer)?; Ok(total) } } @@ -333,7 +333,7 @@ impl SealedEntryExt for SolidEntry<&[u8]> { fn write_in(&self, writer: &mut W) -> io::Result { let mut total = 0; - total += (ChunkType::SHED, self.header.to_bytes().as_slice()).write_chunk_in(writer)?; + total += (ChunkType::SHED, self.header.to_bytes()).write_chunk_in(writer)?; for extra_chunk in &self.extra { total += extra_chunk.write_chunk_in(writer)?; } @@ -343,7 +343,7 @@ impl SealedEntryExt for SolidEntry<&[u8]> { for data in &self.data { total += (ChunkType::SDAT, *data).write_chunk_in(writer)?; } - total += (ChunkType::SEND, [].as_slice()).write_chunk_in(writer)?; + total += (ChunkType::SEND, []).write_chunk_in(writer)?; Ok(total) } } @@ -366,7 +366,7 @@ impl SealedEntryExt for SolidEntry> { fn write_in(&self, writer: &mut W) -> io::Result { let mut total = 0; - total += (ChunkType::SHED, self.header.to_bytes().as_slice()).write_chunk_in(writer)?; + total += (ChunkType::SHED, self.header.to_bytes()).write_chunk_in(writer)?; for extra_chunk in &self.extra { total += extra_chunk.write_chunk_in(writer)?; } @@ -376,7 +376,7 @@ impl SealedEntryExt for SolidEntry> { for data in &self.data { total += (ChunkType::SDAT, data.as_ref()).write_chunk_in(writer)?; } - total += (ChunkType::SEND, [].as_slice()).write_chunk_in(writer)?; + total += (ChunkType::SEND, []).write_chunk_in(writer)?; Ok(total) } } @@ -752,16 +752,13 @@ impl SealedEntryExt for NormalEntry> { } } if let Some(c) = created { - total += - (ChunkType::cTIM, c.as_secs().to_be_bytes().as_slice()).write_chunk_in(writer)?; + total += (ChunkType::cTIM, c.as_secs().to_be_bytes()).write_chunk_in(writer)?; } if let Some(d) = modified { - total += - (ChunkType::mTIM, d.as_secs().to_be_bytes().as_slice()).write_chunk_in(writer)?; + total += (ChunkType::mTIM, d.as_secs().to_be_bytes()).write_chunk_in(writer)?; } if let Some(a) = accessed { - total += - (ChunkType::aTIM, a.as_secs().to_be_bytes().as_slice()).write_chunk_in(writer)?; + total += (ChunkType::aTIM, a.as_secs().to_be_bytes()).write_chunk_in(writer)?; } if let Some(p) = permission { total += (ChunkType::fPRM, p.to_bytes()).write_chunk_in(writer)?; @@ -769,7 +766,7 @@ impl SealedEntryExt for NormalEntry> { for xattr in &self.xattrs { total += (ChunkType::xATR, xattr.to_bytes()).write_chunk_in(writer)?; } - total += (ChunkType::FEND, [].as_slice()).write_chunk_in(writer)?; + total += (ChunkType::FEND, []).write_chunk_in(writer)?; Ok(total) } } @@ -863,16 +860,13 @@ impl SealedEntryExt for NormalEntry<&[u8]> { } } if let Some(c) = created { - total += - (ChunkType::cTIM, c.as_secs().to_be_bytes().as_slice()).write_chunk_in(writer)?; + total += (ChunkType::cTIM, c.as_secs().to_be_bytes()).write_chunk_in(writer)?; } if let Some(d) = modified { - total += - (ChunkType::mTIM, d.as_secs().to_be_bytes().as_slice()).write_chunk_in(writer)?; + total += (ChunkType::mTIM, d.as_secs().to_be_bytes()).write_chunk_in(writer)?; } if let Some(a) = accessed { - total += - (ChunkType::aTIM, a.as_secs().to_be_bytes().as_slice()).write_chunk_in(writer)?; + total += (ChunkType::aTIM, a.as_secs().to_be_bytes()).write_chunk_in(writer)?; } if let Some(p) = permission { total += (ChunkType::fPRM, p.to_bytes()).write_chunk_in(writer)?; @@ -880,7 +874,7 @@ impl SealedEntryExt for NormalEntry<&[u8]> { for xattr in &self.xattrs { total += (ChunkType::xATR, xattr.to_bytes()).write_chunk_in(writer)?; } - total += (ChunkType::FEND, [].as_slice()).write_chunk_in(writer)?; + total += (ChunkType::FEND, []).write_chunk_in(writer)?; Ok(total) } } @@ -974,16 +968,13 @@ impl SealedEntryExt for NormalEntry> { } } if let Some(c) = created { - total += - (ChunkType::cTIM, c.as_secs().to_be_bytes().as_slice()).write_chunk_in(writer)?; + total += (ChunkType::cTIM, c.as_secs().to_be_bytes()).write_chunk_in(writer)?; } if let Some(d) = modified { - total += - (ChunkType::mTIM, d.as_secs().to_be_bytes().as_slice()).write_chunk_in(writer)?; + total += (ChunkType::mTIM, d.as_secs().to_be_bytes()).write_chunk_in(writer)?; } if let Some(a) = accessed { - total += - (ChunkType::aTIM, a.as_secs().to_be_bytes().as_slice()).write_chunk_in(writer)?; + total += (ChunkType::aTIM, a.as_secs().to_be_bytes()).write_chunk_in(writer)?; } if let Some(p) = permission { total += (ChunkType::fPRM, p.to_bytes()).write_chunk_in(writer)?; @@ -991,7 +982,7 @@ impl SealedEntryExt for NormalEntry> { for xattr in &self.xattrs { total += (ChunkType::xATR, xattr.to_bytes()).write_chunk_in(writer)?; } - total += (ChunkType::FEND, [].as_slice()).write_chunk_in(writer)?; + total += (ChunkType::FEND, []).write_chunk_in(writer)?; Ok(total) } }