run cargo fix --edition-idioms and manually fix other things

Cargo.toml

@@ -10,6 +10,7 @@ keywords = ["zip", "archive"]
 description = """
 Library to support the reading and writing of zip files.
 """
+edition = "2018"
 
 [dependencies]
 flate2 = { version = "1.0", default-features = false, optional = true }

benches/read_entry.rs

@@ -1,7 +1,4 @@
-#[macro_use]
-extern crate bencher;
-extern crate rand;
-extern crate zip;
+use bencher::{benchmark_group, benchmark_main};
 
 use std::io::{Cursor, Read, Write};
 

examples/extract.rs

@@ -1,5 +1,3 @@
-extern crate zip;
-
 use std::io;
 use std::fs;
 

examples/extract_lorem.rs

@@ -1,7 +1,5 @@
 use std::io::prelude::*;
 
-extern crate zip;
-
 fn main()
 {
     std::process::exit(real_main());

examples/file_info.rs

@@ -1,5 +1,3 @@
-extern crate zip;
-
 use std::fs;
 use std::io::BufReader;
 

examples/stdin_info.rs

@@ -1,5 +1,3 @@
-extern crate zip;
-
 use std::io::{self, Read};
 
 fn main() {

examples/write_dir.rs

@@ -1,5 +1,3 @@
-extern crate zip;
-extern crate walkdir;
 
 use std::io::prelude::*;
 use std::io::{Write, Seek};

examples/write_sample.rs

@@ -1,8 +1,6 @@
 use std::io::prelude::*;
 use zip::write::FileOptions;
 
-extern crate zip;
-
 fn main()
 {
     std::process::exit(real_main());

src/compression.rs

@@ -45,7 +45,7 @@ impl CompressionMethod {
 }
 
 impl fmt::Display for CompressionMethod {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         // Just duplicate what the Debug format looks like, i.e, the enum key:
         write!(f, "{:?}", self)
     }

src/lib.rs

@@ -2,15 +2,6 @@
 
 #![warn(missing_docs)]
 
-#[cfg(feature = "bzip2")]
-extern crate bzip2;
-extern crate crc32fast;
-#[cfg(feature = "deflate")]
-extern crate flate2;
-extern crate podio;
-#[cfg(feature = "time")]
-extern crate time;
-
 pub use crate::read::ZipArchive;
 pub use crate::write::ZipWriter;
 pub use crate::compression::CompressionMethod;

src/read.rs

@@ -13,8 +13,6 @@ use podio::{ReadPodExt, LittleEndian};
 use crate::types::{ZipFileData, System, DateTime};
 use crate::cp437::FromCp437;
 
-#[cfg(feature = "deflate")]
-use flate2;
 #[cfg(feature = "deflate")]
 use flate2::read::DeflateDecoder;
 
@@ -414,7 +412,7 @@ fn parse_extra_field(file: &mut ZipFileData, data: &[u8]) -> ZipResult<()>
     Ok(())
 }
 
-fn get_reader<'a>(reader: &'a mut ZipFileReader) -> &'a mut dyn Read {
+fn get_reader<'a>(reader: &'a mut ZipFileReader<'_>) -> &'a mut dyn Read {
     match *reader {
         ZipFileReader::NoReader => panic!("ZipFileReader was in an invalid state"),
         ZipFileReader::Stored(ref mut r) => r as &mut dyn Read,
@@ -563,7 +561,7 @@ impl<'a> Drop for ZipFile<'a> {
 /// * `comment`: set to an empty string
 /// * `data_start`: set to 0
 /// * `external_attributes`: `unix_mode()`: will return None
-pub fn read_zipfile_from_stream<'a, R: io::Read>(reader: &'a mut R) -> ZipResult<Option<ZipFile>> {
+pub fn read_zipfile_from_stream<'a, R: io::Read>(reader: &'a mut R) -> ZipResult<Option<ZipFile<'_>>> {
     let signature = reader.read_u32::<LittleEndian>()?;
 
     match signature {

src/result.rs

@@ -27,7 +27,7 @@ pub enum ZipError
 
 impl ZipError
 {
-    fn detail(&self) -> ::std::borrow::Cow<str>
+    fn detail(&self) -> ::std::borrow::Cow<'_, str>
     {
         use std::error::Error;
 
@@ -64,7 +64,7 @@ impl convert::From<ZipError> for io::Error
 
 impl fmt::Display for ZipError
 {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> Result<(), fmt::Error>
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error>
     {
         fmt.write_str(&*self.detail())
     }

src/write.rs

@@ -9,17 +9,11 @@ use std::default::Default;
 use std::io;
 use std::io::prelude::*;
 use std::mem;
-#[cfg(feature = "time")]
-use time;
 use podio::{WritePodExt, LittleEndian};
 
-#[cfg(feature = "deflate")]
-use flate2;
 #[cfg(feature = "deflate")]
 use flate2::write::DeflateEncoder;
 
-#[cfg(feature = "bzip2")]
-use bzip2;
 #[cfg(feature = "bzip2")]
 use bzip2::write::BzEncoder;
 

tests/end_to_end.rs

@@ -1,5 +1,3 @@
-extern crate zip;
-
 use std::io::prelude::*;
 use zip::write::FileOptions;
 use std::io::Cursor;

tests/invalid_date.rs

@@ -1,5 +1,3 @@
-extern crate zip;
-
 use zip::read::ZipArchive;
 use std::io::Cursor;
 

tests/zip64_large.rs

@@ -53,9 +53,6 @@
 // 22c400260  00 00 50 4b 05 06 00 00  00 00 03 00 03 00 27 01  |..PK..........'.|
 // 22c400270  00 00 ff ff ff ff 00 00                           |........|
 // 22c400278
-
-extern crate zip;
-
 use std::io::{self, Seek, SeekFrom, Read};
 
 const BLOCK1_LENGTH : u64 = 0x60;