diff --git a/examples/write_dir.rs b/examples/write_dir.rs index 6aaaed3a..88df62e0 100644 --- a/examples/write_dir.rs +++ b/examples/write_dir.rs @@ -87,7 +87,7 @@ where f.read_to_end(&mut buffer)?; zip.write_all(&*buffer)?; buffer.clear(); - } else if name.as_os_str().len() != 0 { + } else if !name.as_os_str().is_empty() { // Only if not root! Avoids path spec / warning // and mapname conversion failed error on unzip println!("adding dir {:?} as {:?} ...", path, name); diff --git a/examples/write_sample.rs b/examples/write_sample.rs index 163bfe14..b5749509 100644 --- a/examples/write_sample.rs +++ b/examples/write_sample.rs @@ -42,7 +42,7 @@ fn doit(filename: &str) -> zip::result::ZipResult<()> { Ok(()) } -const LOREM_IPSUM : &'static [u8] = b"Lorem ipsum dolor sit amet, consectetur adipiscing elit. In tellus elit, tristique vitae mattis egestas, ultricies vitae risus. Quisque sit amet quam ut urna aliquet +const LOREM_IPSUM : &[u8] = b"Lorem ipsum dolor sit amet, consectetur adipiscing elit. In tellus elit, tristique vitae mattis egestas, ultricies vitae risus. Quisque sit amet quam ut urna aliquet molestie. Proin blandit ornare dui, a tempor nisl accumsan in. Praesent a consequat felis. Morbi metus diam, auctor in auctor vel, feugiat id odio. Curabitur ex ex, dictum quis auctor quis, suscipit id lorem. Aliquam vestibulum dolor nec enim vehicula, porta tristique augue tincidunt. Vivamus ut gravida est. Sed pellentesque, dolor vitae tristique consectetur, neque lectus pulvinar dui, sed feugiat purus diam id lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per diff --git a/src/compression.rs b/src/compression.rs index c1cf44db..21a8e54b 100644 --- a/src/compression.rs +++ b/src/compression.rs @@ -125,7 +125,7 @@ mod test { #[test] fn from_eq_to() { - for v in 0..(::std::u16::MAX as u32 + 1) { + for v in 0..(u16::MAX as u32 + 1) { #[allow(deprecated)] let from = CompressionMethod::from_u16(v as u16); #[allow(deprecated)] @@ -135,17 +135,17 @@ mod test { } fn methods() -> Vec { - let mut methods = Vec::new(); - methods.push(CompressionMethod::Stored); - #[cfg(any( - feature = "deflate", - feature = "deflate-miniz", - feature = "deflate-zlib" - ))] - methods.push(CompressionMethod::Deflated); - #[cfg(feature = "bzip2")] - methods.push(CompressionMethod::Bzip2); - methods + vec![ + CompressionMethod::Stored, + #[cfg(any( + feature = "deflate", + feature = "deflate-miniz", + feature = "deflate-zlib" + ))] + CompressionMethod::Deflated, + #[cfg(feature = "bzip2")] + CompressionMethod::Bzip2, + ] } #[test] diff --git a/src/cp437.rs b/src/cp437.rs index f9948143..4dba9af1 100644 --- a/src/cp437.rs +++ b/src/cp437.rs @@ -6,7 +6,8 @@ pub trait FromCp437 { type Target; /// Function that does the conversion from cp437. - /// Gennerally allocations will be avoided if all data falls into the ASCII range. + /// Generally allocations will be avoided if all data falls into the ASCII range. + #[allow(clippy::wrong_self_convention)] fn from_cp437(self) -> Self::Target; } diff --git a/src/read.rs b/src/read.rs index 6704c070..8b1f36e2 100644 --- a/src/read.rs +++ b/src/read.rs @@ -457,14 +457,14 @@ impl ZipArchive { } /// Get a contained file by index - pub fn by_index(&mut self, file_number: usize) -> ZipResult { + pub fn by_index(&mut self, file_number: usize) -> ZipResult> { Ok(self .by_index_with_optional_password(file_number, None)? .unwrap()) } /// Get a contained file by index without decompressing it - pub fn by_index_raw(&mut self, file_number: usize) -> ZipResult { + pub fn by_index_raw(&mut self, file_number: usize) -> ZipResult> { let reader = &mut self.reader; self.files .get_mut(file_number) @@ -1081,10 +1081,10 @@ mod test { let mut buf3 = [0; 5]; let mut buf4 = [0; 5]; - file1.read(&mut buf1).unwrap(); - file2.read(&mut buf2).unwrap(); - file1.read(&mut buf3).unwrap(); - file2.read(&mut buf4).unwrap(); + file1.read_exact(&mut buf1).unwrap(); + file2.read_exact(&mut buf2).unwrap(); + file1.read_exact(&mut buf3).unwrap(); + file2.read_exact(&mut buf4).unwrap(); assert_eq!(buf1, buf2); assert_eq!(buf3, buf4); diff --git a/src/types.rs b/src/types.rs index 529844e9..88434e3f 100644 --- a/src/types.rs +++ b/src/types.rs @@ -88,6 +88,7 @@ impl DateTime { /// * hour: [0, 23] /// * minute: [0, 59] /// * second: [0, 60] + #[allow(clippy::result_unit_err)] pub fn from_date_and_time( year: u16, month: u8, @@ -96,8 +97,7 @@ impl DateTime { minute: u8, second: u8, ) -> Result { - if year >= 1980 - && year <= 2107 + if (1980..=2107).contains(&year) && month >= 1 && month <= 12 && day >= 1 @@ -123,6 +123,7 @@ impl DateTime { /// Converts a OffsetDateTime object to a DateTime /// /// Returns `Err` when this object is out of bounds + #[allow(clippy::result_unit_err)] pub fn from_time(dt: OffsetDateTime) -> Result { if dt.year() >= 1980 && dt.year() <= 2107 { Ok(DateTime { @@ -322,19 +323,21 @@ mod test { } #[test] + #[allow(clippy::unusual_byte_groupings)] fn datetime_default() { use super::DateTime; let dt = DateTime::default(); assert_eq!(dt.timepart(), 0); - assert_eq!(dt.datepart(), 0b0000_0000_0010_0001); + assert_eq!(dt.datepart(), 0b0000000_0001_00001); } #[test] + #[allow(clippy::unusual_byte_groupings)] fn datetime_max() { use super::DateTime; let dt = DateTime::from_date_and_time(2107, 12, 31, 23, 59, 60).unwrap(); - assert_eq!(dt.timepart(), 0b1011_1111_0111_1110); - assert_eq!(dt.datepart(), 0b1111_1111_1001_1111); + assert_eq!(dt.timepart(), 0b10111_111011_11110); + assert_eq!(dt.datepart(), 0b1111111_1100_11111); } #[test] diff --git a/src/write.rs b/src/write.rs index 30cfa40b..964f07dd 100644 --- a/src/write.rs +++ b/src/write.rs @@ -1233,7 +1233,7 @@ mod test { }; writer.start_file("mimetype", options).unwrap(); writer - .write(b"application/vnd.oasis.opendocument.text") + .write_all(b"application/vnd.oasis.opendocument.text") .unwrap(); let result = writer.finish().unwrap(); diff --git a/tests/end_to_end.rs b/tests/end_to_end.rs index 556f9abf..d0185f60 100644 --- a/tests/end_to_end.rs +++ b/tests/end_to_end.rs @@ -137,7 +137,7 @@ fn check_zip_file_contents(archive: &mut zip::ZipArchive, nam assert_eq!(file_contents.as_bytes(), LOREM_IPSUM); } -const LOREM_IPSUM : &'static [u8] = b"Lorem ipsum dolor sit amet, consectetur adipiscing elit. In tellus elit, tristique vitae mattis egestas, ultricies vitae risus. Quisque sit amet quam ut urna aliquet +const LOREM_IPSUM : &[u8] = b"Lorem ipsum dolor sit amet, consectetur adipiscing elit. In tellus elit, tristique vitae mattis egestas, ultricies vitae risus. Quisque sit amet quam ut urna aliquet molestie. Proin blandit ornare dui, a tempor nisl accumsan in. Praesent a consequat felis. Morbi metus diam, auctor in auctor vel, feugiat id odio. Curabitur ex ex, dictum quis auctor quis, suscipit id lorem. Aliquam vestibulum dolor nec enim vehicula, porta tristique augue tincidunt. Vivamus ut gravida est. Sed pellentesque, dolor vitae tristique consectetur, neque lectus pulvinar dui, sed feugiat purus diam id lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per