lean more on the ::MAGIC trait constants

src/read.rs

@@ -10,7 +10,8 @@ use crate::read::zip_archive::Shared;
 use crate::result::{ZipError, ZipResult};
 use crate::spec::{self, Block};
 use crate::types::{
-    AesMode, AesVendorVersion, DateTime, System, ZipEntryBlock, ZipFileData, ZipLocalEntryBlock,
+    AesMode, AesVendorVersion, DateTime, System, ZipCentralEntryBlock, ZipFileData,
+    ZipLocalEntryBlock,
 };
 use crate::zipcrypto::{ZipCryptoReader, ZipCryptoReaderValid, ZipCryptoValidator};
 use indexmap::IndexMap;
@@ -1022,7 +1023,7 @@ pub(crate) fn central_header_to_zip_file<R: Read + Seek>(
     let central_header_start = reader.stream_position()?;
 
     // Parse central header
-    let block = ZipEntryBlock::parse(reader)?;
+    let block = ZipCentralEntryBlock::parse(reader)?;
     central_header_to_zip_file_inner(reader, archive_offset, central_header_start, block)
 }
 
@@ -1038,9 +1039,9 @@ fn central_header_to_zip_file_inner<R: Read>(
     reader: &mut R,
     archive_offset: u64,
     central_header_start: u64,
-    block: ZipEntryBlock,
+    block: ZipCentralEntryBlock,
 ) -> ZipResult<ZipFileData> {
-    let ZipEntryBlock {
+    let ZipCentralEntryBlock {
         // magic,
         version_made_by,
         // version_to_extract,

src/read/stream.rs

@@ -3,8 +3,8 @@ use std::io::{self, Read};
 use std::path::{Path, PathBuf};
 
 use super::{
-    central_header_to_zip_file_inner, read_zipfile_from_stream, ZipEntryBlock, ZipError, ZipFile,
+    central_header_to_zip_file_inner, read_zipfile_from_stream, ZipCentralEntryBlock, ZipError,
-    ZipFileData, ZipResult,
+    ZipFile, ZipFileData, ZipResult,
 };
 use crate::spec::Block;
 
@@ -27,7 +27,7 @@ impl<R: Read> ZipStreamReader<R> {
         let central_header_start = 0;
 
         // Parse central header
-        let block = ZipEntryBlock::parse(&mut self.0)?;
+        let block = ZipCentralEntryBlock::parse(&mut self.0)?;
         let file = central_header_to_zip_file_inner(
             &mut self.0,
             archive_offset,

src/spec.rs

@@ -219,8 +219,7 @@ impl Zip32CentralDirectoryEnd {
             zip_file_comment,
         } = self;
         let block = Zip32CDEBlock {
-            magic: CENTRAL_DIRECTORY_END_SIGNATURE,
+            magic: Zip32CDEBlock::MAGIC,
-
             disk_number,
             disk_with_central_directory,
             number_of_files_on_this_disk,
@@ -400,7 +399,7 @@ impl Zip64CentralDirectoryEndLocator {
             number_of_disks,
         } = self;
         Zip64CDELocatorBlock {
-            magic: ZIP64_CENTRAL_DIRECTORY_END_LOCATOR_SIGNATURE,
+            magic: Zip64CDELocatorBlock::MAGIC,
             disk_with_central_directory,
             end_of_central_directory_offset,
             number_of_disks,
@@ -583,7 +582,7 @@ impl Zip64CentralDirectoryEnd {
             central_directory_offset,
         } = self;
         Zip64CDEBlock {
-            magic: ZIP64_CENTRAL_DIRECTORY_END_SIGNATURE,
+            magic: Zip64CDEBlock::MAGIC,
             /* currently unused */
             record_size: 44,
             version_made_by,
@@ -684,7 +683,7 @@ mod test {
     #[test]
     fn block_serde() {
         let block = TestBlock {
-            magic: Magic::literal(0x01111),
+            magic: TestBlock::MAGIC,
             file_name_length: 3,
         };
         let mut c = Cursor::new(Vec::new());

src/types.rs

@@ -623,7 +623,6 @@ impl ZipFileData {
             ..
         } = block;
 
-
         let encrypted: bool = flags & 1 == 1;
         if encrypted {
             return Err(ZipError::UnsupportedArchive(
@@ -731,7 +730,7 @@ impl ZipFileData {
             .last_modified_time
             .unwrap_or_else(DateTime::default_for_write);
         Ok(ZipLocalEntryBlock {
-            magic: spec::LOCAL_FILE_HEADER_SIGNATURE,
+            magic: ZipLocalEntryBlock::MAGIC,
             version_made_by: self.version_needed(),
             flags: self.flags(),
             compression_method: self.compression_method.serialize_to_u16(),
@@ -745,14 +744,14 @@ impl ZipFileData {
         })
     }
 
-    pub(crate) fn block(&self, zip64_extra_field_length: u16) -> ZipEntryBlock {
+    pub(crate) fn block(&self, zip64_extra_field_length: u16) -> ZipCentralEntryBlock {
         let extra_field_len: u16 = self.extra_field_len().try_into().unwrap();
         let central_extra_field_len: u16 = self.central_extra_field_len().try_into().unwrap();
         let last_modified_time = self
             .last_modified_time
             .unwrap_or_else(DateTime::default_for_write);
-        ZipEntryBlock {
+        ZipCentralEntryBlock {
-            magic: spec::CENTRAL_DIRECTORY_HEADER_SIGNATURE,
+            magic: ZipCentralEntryBlock::MAGIC,
             version_made_by: (self.system as u16) << 8 | (self.version_made_by as u16),
             version_to_extract: self.version_needed(),
             flags: self.flags(),
@@ -789,7 +788,7 @@ impl ZipFileData {
 
 #[derive(Copy, Clone, Debug)]
 #[repr(packed)]
-pub(crate) struct ZipEntryBlock {
+pub(crate) struct ZipCentralEntryBlock {
     pub magic: spec::Magic,
     pub version_made_by: u16,
     pub version_to_extract: u16,
@@ -809,7 +808,7 @@ pub(crate) struct ZipEntryBlock {
     pub offset: u32,
 }
 
-impl Block for ZipEntryBlock {
+impl Block for ZipCentralEntryBlock {
     const MAGIC: spec::Magic = spec::CENTRAL_DIRECTORY_HEADER_SIGNATURE;
 
     #[inline(always)]