Merge pull request #705 from Mark-Simulacrum/cleanup

Various small cleanups

Author: Mark-Simulacrum

Cargo.lock

@@ -20,7 +20,6 @@ semver = "0.9"
 reqwest = { version = "0.10", features = ["json"] }
 xz2 = "0.1.3"
 tar = "0.4"
-crossbeam-channel = "0.4.2"
 tokio = { version = "0.2", features = ["rt-core"] }
 rustc-artifacts = "0.2"
 database = { path = "../database" }

collector/Cargo.toml

@@ -1,28 +1,3 @@
-pub mod collected {
-    use crate::Commit;
-
-    #[derive(Debug, PartialEq, Clone, serde::Serialize, serde::Deserialize)]
-    pub enum Request {
-        // Will benchmark commit with these benchmarks
-        BenchmarkCommit {
-            commit: Commit,
-            // crate name
-            benchmarks: Vec<String>,
-        },
-        // benchmark finished for this benchmark/commit
-        BenchmarkDone {
-            // crate name
-            benchmark: String,
-            commit: Commit,
-        },
-    }
-
-    #[derive(Debug, PartialEq, Clone, serde::Serialize, serde::Deserialize)]
-    pub struct Response {
-        // nothing
-    }
-}
-
 pub mod next_commit {
     #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
     pub struct Response {

collector/src/api.rs

@@ -1,5 +1,5 @@
 use chrono::NaiveDate;
-pub use database::{Commit, PatchName, QueryLabel, Sha};
+pub use database::{Commit, PatchName, QueryLabel};
 use serde::Deserialize;
 use std::cmp::PartialOrd;
 use std::fmt;

collector/src/background_worker.rs

@@ -4,7 +4,6 @@
 extern crate clap;
 
 use anyhow::{bail, Context};
-use collector::api::collected;
 use database::{pool::Connection, ArtifactId, Commit};
 use log::debug;
 use std::collections::HashSet;
@@ -16,11 +15,9 @@ use std::process::Command;
 use std::{str, time::Instant};
 use tokio::runtime::Runtime;
 
-mod background_worker;
 mod execute;
 mod sysroot;
 
-use background_worker::send_home;
 use execute::{Benchmark, Profiler};
 use sysroot::Sysroot;
 
@@ -195,21 +192,11 @@ fn bench(
     compiler: Compiler<'_>,
     benchmarks: &[Benchmark],
     iterations: usize,
-    call_home: bool,
     self_profile: bool,
 ) -> BenchmarkErrors {
     let mut errors = BenchmarkErrors::new();
     eprintln!("Benchmarking {} for triple {}", cid, compiler.triple);
 
-    if call_home {
-        if let ArtifactId::Commit(commit) = cid {
-            send_home(collected::Request::BenchmarkCommit {
-                commit: commit.clone(),
-                benchmarks: benchmarks.iter().map(|b| b.name.to_string()).collect(),
-            });
-        }
-    }
-
     let has_measureme = Command::new("summarize").output().is_ok();
     if self_profile {
         assert!(
@@ -267,15 +254,6 @@ fn bench(
                 &format!("{:?}", s),
             ));
         };
-
-        if call_home {
-            if let ArtifactId::Commit(commit) = cid {
-                send_home(collected::Request::BenchmarkDone {
-                    benchmark: benchmark.name.to_string(),
-                    commit: commit.clone(),
-                });
-            }
-        }
     }
     let end = start.elapsed();
 
@@ -559,7 +537,6 @@ fn main_result() -> anyhow::Result<i32> {
                 },
                 &benchmarks,
                 1,
-                /* call_home */ false,
                 self_profile,
             );
             res.fail_if_nonzero()?;
@@ -606,7 +583,6 @@ fn main_result() -> anyhow::Result<i32> {
                 Compiler::from_sysroot(&sysroot),
                 &benchmarks,
                 3,
-                /* call_home */ true,
                 self_profile,
             );
 
@@ -684,7 +660,6 @@ fn main_result() -> anyhow::Result<i32> {
                 },
                 &benchmarks,
                 3,
-                /* call_home */ false,
                 /* self_profile */ false,
             );
             res.fail_if_nonzero()?;
@@ -768,7 +743,6 @@ fn main_result() -> anyhow::Result<i32> {
             Ok(2)
         }
     };
-    background_worker::shut_down();
     ret
 }
 

collector/src/lib.rs

@@ -141,106 +141,9 @@ impl<'de> Deserialize<'de> for Date {
     }
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum Sha {
-    /// Straight-up bytes of the 40-long hex-encoded sha
-    Hex([u8; 20]),
-    /// Usually a string ID provided by the user.
-    Raw(RawSha),
-}
-
-intern!(pub struct RawSha);
-
-impl PartialEq<str> for Sha {
-    fn eq(&self, other: &str) -> bool {
-        self.to_string() == other
-    }
-}
-
-fn hex_decode(s: &str) -> Option<[u8; 20]> {
-    let mut in_progress = 0;
-    let mut v = [0; 20];
-    for (idx, ch) in s.chars().enumerate() {
-        let offset = if idx % 2 == 0 { 4 } else { 0 };
-        in_progress |= (ch.to_digit(16)? as u8) << offset;
-        if idx % 2 != 0 {
-            v[idx / 2] = in_progress;
-            in_progress = 0;
-        }
-    }
-    Some(v)
-}
-
-impl<'a> From<&'a str> for Sha {
-    fn from(s: &'a str) -> Sha {
-        if let Some(v) = hex_decode(s) {
-            return Sha::Hex(v);
-        }
-
-        Sha::Raw(s.into())
-    }
-}
-
-impl Serialize for Sha {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::ser::Serializer,
-    {
-        serializer.collect_str(&self)
-    }
-}
-
-impl<'de> Deserialize<'de> for Sha {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::de::Deserializer<'de>,
-    {
-        use serde::de::Visitor;
-        struct ShaVisitor;
-        impl<'de> Visitor<'de> for ShaVisitor {
-            type Value = Sha;
-
-            fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                f.write_str("a string")
-            }
-
-            fn visit_str<E>(self, s: &str) -> Result<Sha, E> {
-                Ok(s.into())
-            }
-
-            fn visit_borrowed_str<E>(self, s: &'de str) -> Result<Sha, E> {
-                Ok(s.into())
-            }
-        }
-        deserializer.deserialize_str(ShaVisitor)
-    }
-}
-
-impl fmt::Debug for Sha {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self)
-    }
-}
-
-impl fmt::Display for Sha {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            Sha::Hex(hex) => {
-                for &b in hex.iter() {
-                    write!(f, "{:x}{:x}", b >> 4, b & 0xf)?;
-                }
-            }
-            Sha::Raw(raw) => {
-                write!(f, "{}", raw)?;
-            }
-        }
-        Ok(())
-    }
-}
-
-#[derive(Debug, Copy, Clone, serde::Deserialize, serde::Serialize)]
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
 pub struct Commit {
-    pub sha: Sha,
+    pub sha: String,
     pub date: Date,
 }
 
@@ -709,7 +612,7 @@ impl Index {
     }
 
     pub fn commits(&self) -> Vec<Commit> {
-        let mut commits = self.commits.map.keys().copied().collect::<Vec<_>>();
+        let mut commits = self.commits.map.keys().cloned().collect::<Vec<_>>();
         commits.sort();
         commits
     }

collector/src/main.rs

@@ -108,7 +108,7 @@ pub mod data {
 }
 
 pub mod graph {
-    use collector::{Bound, Sha};
+    use collector::Bound;
     use serde::{Deserialize, Serialize};
     use std::collections::HashMap;
 
@@ -135,7 +135,7 @@ pub mod graph {
         pub benchmarks: HashMap<String, HashMap<String, Vec<(String, Vec<GraphData>)>>>,
         pub max: HashMap<String, f32>,
         pub colors: Vec<String>,
-        pub commits: Vec<Sha>,
+        pub commits: Vec<String>,
     }
 }