Merge pull request #74 from MaloJaffre/flate-1.0

Upgrade flate crate to 1.0.1

Author: alexcrichton

Cargo.toml

@@ -10,7 +10,7 @@ path = "src/main.rs"
 
 [dependencies]
 error-chain = "0.11.0"
-flate2 = "0.2.19"
+flate2 = "1.0.1"
 tar = "0.4.13"
 walkdir = "1.0.7"
 xz2 = "0.1.3"

src/combiner.rs

@@ -65,8 +65,8 @@ impl Combiner {
         let components = create_new_file(package_dir.join("components"))?;
         for input_tarball in self.input_tarballs.split(',').map(str::trim).filter(|s| !s.is_empty()) {
             // Extract the input tarballs
-            GzDecoder::new(open_file(&input_tarball)?)
-                .and_then(|tar| Archive::new(tar).unpack(&self.work_dir))
+            let tar = GzDecoder::new(open_file(&input_tarball)?);
+            Archive::new(tar).unpack(&self.work_dir)
                 .chain_err(|| format!("unable to extract '{}' into '{}'",
                                       &input_tarball, self.work_dir))?;
 

src/tarballer.rs

@@ -79,7 +79,7 @@ impl Tarballer {
         let contents2 = contents.clone();
         let t = thread::spawn(move || {
             let mut gz = GzEncoder::new(create_new_file(tar_gz)?,
-                                        flate2::Compression::Best);
+                                        flate2::Compression::best());
             gz.write_all(&contents2).chain_err(|| "failed to write .gz")?;
             gz.finish().chain_err(|| "failed to finish .gz")
         });