Update snap to 1.0

Author: rylev

Cargo.lock

@@ -23,7 +23,7 @@ xz2 = "0.1.3"
 tar = "0.4"
 crossbeam-channel = "0.3.8"
 bincode = "1"
-snap = "0.2.5"
+snap = "1.0"
 hashbrown = "0.7.0"
 bumpalo = "3.2"
 

collector/Cargo.toml

@@ -14,8 +14,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         if filename.starts_with("commit-") && filename.ends_with(".sz") {
             eprintln!("{:?}", filename);
             use std::io::Read;
-            let mut out = String::with_capacity(snap::decompress_len(&file_contents).unwrap_or(0));
-            let mut szip_reader = snap::Reader::new(&file_contents[..]);
+            let mut out =
+                String::with_capacity(snap::raw::decompress_len(&file_contents).unwrap_or(0));
+            let mut szip_reader = snap::read::FrameDecoder::new(&file_contents[..]);
             szip_reader.read_to_string(&mut out).unwrap();
             let file_contents = out.as_str();
 
@@ -26,7 +27,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                     continue;
                 }
             };
-            let mut v = snap::Writer::new(Vec::new());
+            let mut v = snap::write::FrameEncoder::new(Vec::new());
             serde_json::to_writer(&mut v, &contents)?;
             fs::write(entry.path(), v.into_inner()?)?;
         }

collector/src/bin/recode.rs

@@ -66,10 +66,7 @@ impl Repo {
     }
 
     pub fn open(path: PathBuf, allow_new_dir: bool, use_remote: bool) -> anyhow::Result<Self> {
-        let result = Repo {
-            path: path,
-            use_remote,
-        };
+        let result = Repo { path, use_remote };
 
         // Don't nuke random repositories, unless specifically requested.
         if !allow_new_dir && !result.perf_file().exists() {
@@ -126,8 +123,8 @@ impl Repo {
         let c;
         let contents = if filepath.to_str().map_or(false, |s| s.ends_with(".sz")) {
             use std::io::Read;
-            let mut out = Vec::with_capacity(snap::decompress_len(&contents).unwrap_or(0));
-            let mut szip_reader = snap::Reader::new(&contents[..]);
+            let mut out = Vec::with_capacity(snap::raw::decompress_len(&contents).unwrap_or(0));
+            let mut szip_reader = snap::read::FrameDecoder::new(&contents[..]);
             szip_reader.read_to_end(&mut out).unwrap();
             c = out;
             &c
@@ -168,7 +165,7 @@ impl Repo {
             commit.sha
         ));
         info!("creating file {}", filepath.display());
-        let mut v = snap::Writer::new(Vec::new());
+        let mut v = snap::write::FrameEncoder::new(Vec::new());
         serde_json::to_writer(&mut v, &data)?;
         fs::write(&filepath, v.into_inner()?)?;
         Ok(())

collector/src/bin/rustc-perf-collector/outrepo.rs

@@ -237,19 +237,11 @@ pub enum BenchmarkState {
 
 impl BenchmarkState {
     pub fn is_base_compile(&self) -> bool {
-        if let BenchmarkState::Clean = *self {
-            true
-        } else {
-            false
-        }
+        matches!(*self, BenchmarkState::Clean)
     }
 
     pub fn is_patch(&self) -> bool {
-        if let BenchmarkState::IncrementalPatched(_) = *self {
-            true
-        } else {
-            false
-        }
+        matches!(*self, BenchmarkState::IncrementalPatched(_))
     }
 
     pub fn name(&self) -> Cow<'static, str> {