From 061cdf149f6f2e886071e2cdb05f32889e90b3a0 Mon Sep 17 00:00:00 2001 From: Alexander Zaitsev Date: Sun, 23 Jan 2022 17:15:24 +0300 Subject: [PATCH 1/5] fix: fix Clippy warnings - fix a bunch of Clippy warnings - fix some usages of assert! (change to assert_ne) Tested: - Local unit-tests run --- examples/extract.rs | 3 ++- examples/extract_lorem.rs | 2 +- examples/file_info.rs | 3 ++- examples/stdin_info.rs | 3 ++- examples/write_dir.rs | 2 +- examples/write_sample.rs | 2 +- src/read.rs | 25 ++++++++++++------------- src/types.rs | 15 ++++++--------- src/write.rs | 18 +++++++++--------- src/zipcrypto.rs | 8 ++++---- tests/end_to_end.rs | 6 +++--- 11 files changed, 43 insertions(+), 44 deletions(-) diff --git a/examples/extract.rs b/examples/extract.rs index 05c5a4aa..b02eb4cd 100644 --- a/examples/extract.rs +++ b/examples/extract.rs @@ -59,5 +59,6 @@ fn real_main() -> i32 { } } } - return 0; + + 0 } diff --git a/examples/extract_lorem.rs b/examples/extract_lorem.rs index 89e33ef9..a34a04f4 100644 --- a/examples/extract_lorem.rs +++ b/examples/extract_lorem.rs @@ -27,5 +27,5 @@ fn real_main() -> i32 { file.read_to_string(&mut contents).unwrap(); println!("{}", contents); - return 0; + 0 } diff --git a/examples/file_info.rs b/examples/file_info.rs index 315b5c38..824278df 100644 --- a/examples/file_info.rs +++ b/examples/file_info.rs @@ -49,5 +49,6 @@ fn real_main() -> i32 { ); } } - return 0; + + 0 } diff --git a/examples/stdin_info.rs b/examples/stdin_info.rs index 606944ce..10d7aa8b 100644 --- a/examples/stdin_info.rs +++ b/examples/stdin_info.rs @@ -30,5 +30,6 @@ fn real_main() -> i32 { } } } - return 0; + + 0 } diff --git a/examples/write_dir.rs b/examples/write_dir.rs index 793bd6ba..6aaaed3a 100644 --- a/examples/write_dir.rs +++ b/examples/write_dir.rs @@ -54,7 +54,7 @@ fn real_main() -> i32 { } } - return 0; + 0 } fn zip_dir( diff --git a/examples/write_sample.rs b/examples/write_sample.rs index 4ef5ce34..163bfe14 100644 --- a/examples/write_sample.rs +++ b/examples/write_sample.rs @@ -18,7 +18,7 @@ fn real_main() -> i32 { Err(e) => println!("Error: {:?}", e), } - return 0; + 0 } fn doit(filename: &str) -> zip::result::ZipResult<()> { diff --git a/src/read.rs b/src/read.rs index 7b503ed6..6704c070 100644 --- a/src/read.rs +++ b/src/read.rs @@ -189,11 +189,11 @@ fn make_crypto_reader<'a>( Ok(Ok(reader)) } -fn make_reader<'a>( +fn make_reader( compression_method: CompressionMethod, crc32: u32, - reader: CryptoReader<'a>, -) -> ZipFileReader<'a> { + reader: CryptoReader, +) -> ZipFileReader { match compression_method { CompressionMethod::Stored => ZipFileReader::Stored(Crc32Reader::new(reader, crc32)), #[cfg(any( @@ -303,7 +303,7 @@ impl ZipArchive { let directory_start = footer .central_directory_offset .checked_add(archive_offset) - .ok_or_else(|| { + .ok_or({ ZipError::InvalidArchive("Invalid central directory size or offset") })?; @@ -332,7 +332,7 @@ impl ZipArchive { let mut files = Vec::new(); let mut names_map = HashMap::new(); - if let Err(_) = reader.seek(io::SeekFrom::Start(directory_start)) { + if reader.seek(io::SeekFrom::Start(directory_start)).is_err() { return Err(ZipError::InvalidArchive( "Could not seek to start of central directory", )); @@ -457,14 +457,14 @@ impl ZipArchive { } /// Get a contained file by index - pub fn by_index<'a>(&'a 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<'a>(&'a 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) @@ -1020,7 +1020,7 @@ mod test { let mut v = Vec::new(); v.extend_from_slice(include_bytes!("../tests/data/zip64_demo.zip")); let reader = ZipArchive::new(io::Cursor::new(v)).unwrap(); - assert!(reader.len() == 1); + assert_eq!(reader.len(), 1); } #[test] @@ -1031,7 +1031,7 @@ mod test { let mut v = Vec::new(); v.extend_from_slice(include_bytes!("../tests/data/mimetype.zip")); let mut reader = ZipArchive::new(io::Cursor::new(v)).unwrap(); - assert!(reader.comment() == b""); + assert_eq!(reader.comment(), b""); assert_eq!(reader.by_index(0).unwrap().central_header_start(), 77); } @@ -1044,9 +1044,8 @@ mod test { v.extend_from_slice(include_bytes!("../tests/data/mimetype.zip")); let mut reader = io::Cursor::new(v); loop { - match read_zipfile_from_stream(&mut reader).unwrap() { - None => break, - _ => (), + if read_zipfile_from_stream(&mut reader).unwrap().is_none() { + break; } } } @@ -1089,7 +1088,7 @@ mod test { assert_eq!(buf1, buf2); assert_eq!(buf3, buf4); - assert!(buf1 != buf3); + assert_ne!(buf1, buf3); } #[test] diff --git a/src/types.rs b/src/types.rs index f99bc06b..529844e9 100644 --- a/src/types.rs +++ b/src/types.rs @@ -65,7 +65,7 @@ impl DateTime { let seconds = (timepart & 0b0000000000011111) << 1; let minutes = (timepart & 0b0000011111100000) >> 5; let hours = (timepart & 0b1111100000000000) >> 11; - let days = (datepart & 0b0000000000011111) >> 0; + let days = datepart & 0b0000000000011111; let months = (datepart & 0b0000000111100000) >> 5; let years = (datepart & 0b1111111000000000) >> 9; @@ -256,10 +256,7 @@ impl ZipFileData { ::std::path::Path::new(&filename) .components() - .filter(|component| match *component { - ::std::path::Component::Normal(..) => true, - _ => false, - }) + .filter(|component| matches!(*component, ::std::path::Component::Normal(..))) .fold(::std::path::PathBuf::new(), |mut path, ref cur| { path.push(cur.as_os_str()); path @@ -329,15 +326,15 @@ mod test { use super::DateTime; let dt = DateTime::default(); assert_eq!(dt.timepart(), 0); - assert_eq!(dt.datepart(), 0b0000000_0001_00001); + assert_eq!(dt.datepart(), 0b0000_0000_0010_0001); } #[test] fn datetime_max() { use super::DateTime; let dt = DateTime::from_date_and_time(2107, 12, 31, 23, 59, 60).unwrap(); - assert_eq!(dt.timepart(), 0b10111_111011_11110); - assert_eq!(dt.datepart(), 0b1111111_1100_11111); + assert_eq!(dt.timepart(), 0b1011_1111_0111_1110); + assert_eq!(dt.datepart(), 0b1111_1111_1001_1111); } #[test] @@ -394,7 +391,7 @@ mod test { #[cfg(feature = "time")] assert_eq!( - format!("{}", dt.to_time().unwrap().format(&Rfc3339).unwrap()), + dt.to_time().unwrap().format(&Rfc3339).unwrap(), "2018-11-17T10:38:30Z" ); } diff --git a/src/write.rs b/src/write.rs index 2f904a61..30cfa40b 100644 --- a/src/write.rs +++ b/src/write.rs @@ -237,7 +237,10 @@ impl ZipWriter { let (archive_offset, directory_start, number_of_files) = ZipArchive::get_directory_counts(&mut readwriter, &footer, cde_start_pos)?; - if let Err(_) = readwriter.seek(io::SeekFrom::Start(directory_start)) { + if readwriter + .seek(io::SeekFrom::Start(directory_start)) + .is_err() + { return Err(ZipError::InvalidArchive( "Could not seek to start of central directory", )); @@ -307,7 +310,7 @@ impl ZipWriter { { self.finish_file()?; - let raw_values = raw_values.unwrap_or_else(|| ZipRawValues { + let raw_values = raw_values.unwrap_or(ZipRawValues { crc32: 0, compressed_size: 0, uncompressed_size: 0, @@ -548,7 +551,7 @@ impl ZipWriter { } let file = self.files.last_mut().unwrap(); - validate_extra_data(&file)?; + validate_extra_data(file)?; if !self.writing_to_central_extra_field_only { let writer = self.inner.get_plain(); @@ -858,10 +861,7 @@ impl GenericZipWriter { } fn is_closed(&self) -> bool { - match *self { - GenericZipWriter::Closed => true, - _ => false, - } + matches!(*self, GenericZipWriter::Closed) } fn get_plain(&mut self) -> &mut W { @@ -935,7 +935,7 @@ fn write_local_file_header(writer: &mut T, file: &ZipFileData) -> ZipR writer.write_all(file.file_name.as_bytes())?; // zip64 extra field if file.large_file { - write_local_zip64_extra_field(writer, &file)?; + write_local_zip64_extra_field(writer, file)?; } Ok(()) @@ -1053,7 +1053,7 @@ fn validate_extra_data(file: &ZipFileData) -> ZipResult<()> { ))); } - while data.len() > 0 { + while !data.is_empty() { let left = data.len(); if left < 4 { return Err(ZipError::Io(io::Error::new( diff --git a/src/zipcrypto.rs b/src/zipcrypto.rs index 3196ea36..91d40395 100644 --- a/src/zipcrypto.rs +++ b/src/zipcrypto.rs @@ -47,7 +47,7 @@ impl ZipCryptoKeys { } fn crc32(crc: Wrapping, input: u8) -> Wrapping { - return (crc >> 8) ^ Wrapping(CRCTABLE[((crc & Wrapping(0xff)).0 as u8 ^ input) as usize]); + (crc >> 8) ^ Wrapping(CRCTABLE[((crc & Wrapping(0xff)).0 as u8 ^ input) as usize]) } } @@ -71,7 +71,7 @@ impl ZipCryptoReader { /// password byte sequence that is unrepresentable in UTF-8. pub fn new(file: R, password: &[u8]) -> ZipCryptoReader { let mut result = ZipCryptoReader { - file: file, + file, keys: ZipCryptoKeys::new(), }; @@ -129,11 +129,11 @@ pub struct ZipCryptoReaderValid { } impl std::io::Read for ZipCryptoReaderValid { - fn read(&mut self, mut buf: &mut [u8]) -> std::io::Result { + fn read(&mut self, buf: &mut [u8]) -> std::io::Result { // Note: There might be potential for optimization. Inspiration can be found at: // https://github.com/kornelski/7z/blob/master/CPP/7zip/Crypto/ZipCrypto.cpp - let result = self.reader.file.read(&mut buf); + let result = self.reader.file.read(buf); for byte in buf.iter_mut() { *byte = self.reader.keys.decrypt_byte(*byte); } diff --git a/tests/end_to_end.rs b/tests/end_to_end.rs index baebd287..556f9abf 100644 --- a/tests/end_to_end.rs +++ b/tests/end_to_end.rs @@ -100,7 +100,7 @@ fn read_zip(zip_file: R) -> zip::result::ZipResult>(); assert_eq!(file_names, expected_file_names); @@ -134,7 +134,7 @@ fn check_zip_contents(zip_file: &mut Cursor>, name: &str) { fn check_zip_file_contents(archive: &mut zip::ZipArchive, name: &str) { let file_contents: String = read_zip_file(archive, name).unwrap(); - assert!(file_contents.as_bytes() == LOREM_IPSUM); + 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 @@ -144,7 +144,7 @@ vitae tristique consectetur, neque lectus pulvinar dui, sed feugiat purus diam i inceptos himenaeos. Maecenas feugiat velit in ex ultrices scelerisque id id neque. "; -const EXTRA_DATA: &'static [u8] = b"Extra Data"; +const EXTRA_DATA: &[u8] = b"Extra Data"; const ENTRY_NAME: &str = "test/lorem_ipsum.txt"; From f956a2eb85e351a511d5b9d004dd0119388f47ba Mon Sep 17 00:00:00 2001 From: Alexander Zaitsev Date: Sun, 23 Jan 2022 17:35:39 +0300 Subject: [PATCH 2/5] doc: veeeery small fix to CoC - remove extra new line at the beggining of the file --- CODE_OF_CONDUCT.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 845634eb..2290ec2b 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,4 +1,3 @@ - # Contributor Covenant Code of Conduct ## Our Pledge From e636399935c04533368adc4f76f73b48d99f26e7 Mon Sep 17 00:00:00 2001 From: Alexander Zaitsev Date: Sun, 23 Jan 2022 18:06:30 +0300 Subject: [PATCH 3/5] fix: fix all Clippy warnings - some warnings are muted since fixing them right now can be a breaking API change - fix Clippy warns in the src, examples and tests Tested: - Local test run --- examples/write_dir.rs | 2 +- examples/write_sample.rs | 2 +- src/compression.rs | 24 ++++++++++++------------ src/cp437.rs | 3 ++- src/read.rs | 12 ++++++------ src/types.rs | 13 ++++++++----- src/write.rs | 2 +- tests/end_to_end.rs | 2 +- 8 files changed, 32 insertions(+), 28 deletions(-) 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 From a5ae0bbe64c975c377258fc0265dd10716242177 Mon Sep 17 00:00:00 2001 From: Alexander Zaitsev Date: Sun, 23 Jan 2022 19:02:57 +0300 Subject: [PATCH 4/5] feat: add Clippy to CI - enable Clippy on CI Tested: - No --- .github/workflows/ci.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ced1cb57..6f0e4b9d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,6 +39,25 @@ jobs: command: test args: --all + clippy: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: nightly + override: true + components: clippy + + - name: clippy + uses: actions-rs/cargo@v1 + with: + command: clippy + args: --all-targets --all-features -- -D warnings + check_fmt_and_docs: name: Checking fmt and docs runs-on: ubuntu-latest From 113afbeafed09723e266e094d33c6ae996ab1353 Mon Sep 17 00:00:00 2001 From: Alexander Zaitsev Date: Sun, 23 Jan 2022 19:07:24 +0300 Subject: [PATCH 5/5] fix: Clippy fix - small Clippy fix from CI Tested: - No --- examples/write_dir.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/write_dir.rs b/examples/write_dir.rs index 88df62e0..ccb94cd2 100644 --- a/examples/write_dir.rs +++ b/examples/write_dir.rs @@ -111,7 +111,7 @@ fn doit( let path = Path::new(dst_file); let file = File::create(&path).unwrap(); - let walkdir = WalkDir::new(src_dir.to_string()); + let walkdir = WalkDir::new(src_dir); let it = walkdir.into_iter(); zip_dir(&mut it.filter_map(|e| e.ok()), src_dir, file, method)?;