Merge #1438

1438: Update `flate2` to 1.0 and address changes r=carols10cents

Author: bors-voyager[bot]

Cargo.lock

@@ -30,7 +30,7 @@ rustdoc-args = [
 cargo-registry-s3 = { path = "src/s3", version = "0.2.0" }
 rand = "0.3"
 git2 = "0.6.4"
-flate2 = "0.2"
+flate2 = "1.0"
 semver = "0.5"
 url = "1.2.1"
 tar = "0.4.13"

Cargo.toml

@@ -220,10 +220,7 @@ fn get_readme(config: &Config, version: &Version, krate_name: &str) -> Option<St
         return None;
     }
     let reader = Cursor::new(response);
-    let reader = GzDecoder::new(reader).expect(&format!(
-        "[{}-{}] Invalid gzip header",
-        krate_name, version.num
-    ));
+    let reader = GzDecoder::new(reader);
     let mut archive = Archive::new(reader);
     let mut entries = archive.entries().expect(&format!(
         "[{}-{}] Invalid tar archive entries",

src/bin/render-readmes.rs

@@ -705,7 +705,7 @@ fn new_crate_to_body_with_io(
 ) -> Vec<u8> {
     let mut tarball = Vec::new();
     {
-        let mut ar = tar::Builder::new(GzEncoder::new(&mut tarball, Compression::Default));
+        let mut ar = tar::Builder::new(GzEncoder::new(&mut tarball, Compression::default()));
         for &mut (name, ref mut data, size) in files {
             let mut header = tar::Header::new_gnu();
             t!(header.set_path(name));

src/tests/all.rs

@@ -250,7 +250,7 @@ fn verify_tarball(
     max_unpack: u64,
 ) -> CargoResult<()> {
     // All our data is currently encoded with gzip
-    let decoder = GzDecoder::new(tarball)?;
+    let decoder = GzDecoder::new(tarball);
 
     // Don't let gzip decompression go into the weeeds, apply a fixed cap after
     // which point we say the decompressed source is "too large".