Switch from libflate to flate2

Cargo.toml

@@ -45,7 +45,7 @@ once_cell = "1.12.0"
 [dev-dependencies]
 assert_cmd = "2.1.1"
 criterion = "0.8"
-libflate = "2"
+flate2 = "1.1.9"
 maplit = "1.0.1"
 pretty_assertions = "1"
 rand = { version = "0.10", features = ["thread_rng"] }

benches/collapse.rs

@@ -2,8 +2,8 @@ use std::fs::File;
 use std::io::{self, Read};
 
 use criterion::*;
+use flate2::read::GzDecoder;
 use inferno::collapse::{dtrace, perf, sample, Collapse};
-use libflate::gzip::Decoder;
 use once_cell::sync::Lazy;
 
 const INFILE_DTRACE: &str = "flamegraph/example-dtrace-stacks.txt";
@@ -16,7 +16,7 @@ static NTHREADS: Lazy<usize> = Lazy::new(|| std::thread::available_parallelism()
 fn read_infile(infile: &str, buf: &mut Vec<u8>) -> io::Result<()> {
     let mut f = File::open(infile)?;
     if infile.ends_with(".gz") {
-        let mut r = io::BufReader::new(Decoder::new(f)?);
+        let mut r = GzDecoder::new(f);
         r.read_to_end(buf)?;
     } else {
         f.read_to_end(buf)?;

src/collapse/common.rs

@@ -573,7 +573,7 @@ pub(crate) mod testing {
     use std::path::{Path, PathBuf};
     use std::time::Instant;
 
-    use libflate::gzip::Decoder;
+    use flate2::read::GzDecoder;
 
     use super::*;
     use crate::collapse::Collapse;
@@ -589,7 +589,7 @@ pub(crate) mod testing {
                 let mut buf = Vec::new();
                 let mut file = File::open(path)?;
                 if path.to_str().unwrap().ends_with(".gz") {
-                    let mut reader = Decoder::new(file)?;
+                    let mut reader = GzDecoder::new(file);
                     reader.read_to_end(&mut buf)?;
                 } else {
                     file.read_to_end(&mut buf)?;

tests/common/collapse.rs

@@ -1,8 +1,8 @@
 use std::fs::{self, File};
 use std::io::{self, BufRead, BufReader, Cursor};
 
+use flate2::read::GzDecoder;
 use inferno::collapse::Collapse;
-use libflate::gzip::Decoder;
 use pretty_assertions::assert_eq;
 use testing_logger::CapturedLog;
 
@@ -55,7 +55,7 @@ where
     let mut collapse = move |out: &mut dyn io::Write| {
         if test_filename.ends_with(".gz") {
             let test_file = File::open(test_filename)?;
-            let r = BufReader::new(Decoder::new(test_file).unwrap());
+            let r = BufReader::new(GzDecoder::new(test_file));
             collapser.collapse(r, out)
         } else {
             collapser.collapse_file(Some(test_filename), out)
@@ -123,7 +123,7 @@ where
     let mut collapse = move |out: &mut dyn io::Write| {
         if test_filename.ends_with(".gz") {
             let test_file = File::open(test_filename)?;
-            let r = BufReader::new(Decoder::new(test_file).unwrap());
+            let r = BufReader::new(GzDecoder::new(test_file));
             collapser.collapse(r, out)
         } else {
             collapser.collapse_file(Some(test_filename), out)