Inline the master_commits call

Author: rylev

Cargo.lock

@@ -14,14 +14,13 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 tempfile = "3"
 libc = "0.2"
-chrono = "0.4"
+chrono = { version = "0.4", features = ["serde"] }
 lazy_static = "1"
 semver = "1.0"
 reqwest = { version = "0.11", features = ["json"] }
 xz2 = "0.1.3"
 tar = "0.4"
 tokio = { version = "1.6", features = ["rt"] }
-rustc-artifacts = { path = "../../rustc-artifacts"}
 database = { path = "../database" }
 intern = { path = "../intern" }
 futures = "0.3.5"

collector/Cargo.toml

@@ -224,3 +224,29 @@ pub fn command_output(cmd: &mut Command) -> anyhow::Result<process::Output> {
 
     Ok(output)
 }
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct MasterCommit {
+    pub sha: String,
+    pub parent_sha: String,
+    /// This is the pull request which this commit merged in.
+    #[serde(default)]
+    pub pr: Option<u32>,
+    pub time: chrono::DateTime<chrono::Utc>,
+}
+
+/// This provides the master-branch Rust commits which should have accompanying
+/// bors artifacts available.
+///
+/// The first commit returned (at index 0) is the most recent, the last is the
+/// oldest.
+///
+/// Specifically, this is the last 168 days of bors commits.
+///
+/// Note that this does not contain try commits today, so it should not be used
+/// to validate hashes or expand them generally speaking. This may also change
+/// in the future.
+pub async fn master_commits() -> Result<Vec<MasterCommit>, Box<dyn std::error::Error + Sync + Send>> {
+    let response = reqwest::get("https://triage.rust-lang.org/bors-commit-list").await?;
+    Ok(response.json().await?)
+}

collector/src/lib.rs

@@ -811,7 +811,7 @@ fn main_result() -> anyhow::Result<i32> {
 pub fn get_commit_or_fake_it(sha: &str) -> anyhow::Result<Commit> {
     let rt = tokio::runtime::Runtime::new().unwrap();
     Ok(rt
-        .block_on(rustc_artifacts::master_commits())
+        .block_on(collector::master_commits())
         .map_err(|e| anyhow::anyhow!("{:?}", e))
         .context("getting master commit list")?
         .into_iter()

collector/src/main.rs

@@ -30,7 +30,6 @@ toml = "0.5"
 rust_team_data = { git = "https://github.com/rust-lang/team" }
 parking_lot = "0.11"
 snap = "1"
-rustc-artifacts = { path = "../../rustc-artifacts"}
 itertools = "0.10"
 hashbrown = { version = "0.11", features = ["serde"] }
 arc-swap = "1.3"

site/Cargo.toml

@@ -24,7 +24,7 @@ pub async fn handle_triage(
     let start = body.start;
     let end = body.end;
     // Compare against self to get next
-    let master_commits = rustc_artifacts::master_commits().await?;
+    let master_commits = collector::master_commits().await?;
     let comparison = compare(
         start.clone(),
         start.clone(),
@@ -76,7 +76,7 @@ pub async fn handle_compare(
     body: api::days::Request,
     data: &InputData,
 ) -> Result<api::days::Response, BoxedError> {
-    let commits = rustc_artifacts::master_commits().await?;
+    let commits = collector::master_commits().await?;
     let comparison =
         crate::comparison::compare(body.start, body.end, body.stat, data, &commits).await?;
 
@@ -201,7 +201,7 @@ pub async fn compare(
     end: Bound,
     stat: String,
     data: &InputData,
-    master_commits: &[rustc_artifacts::Commit],
+    master_commits: &[collector::MasterCommit],
 ) -> Result<Comparison, BoxedError> {
     let a = data
         .data_for(true, start.clone())
@@ -245,7 +245,7 @@ impl DateData {
         conn: &dyn database::Connection,
         commit: ArtifactId,
         series: &mut [selector::SeriesResponse<T>],
-        master_commits: &[rustc_artifacts::Commit],
+        master_commits: &[collector::MasterCommit],
     ) -> Self
     where
         T: Iterator<Item = (db::ArtifactId, Option<f64>)>,
@@ -324,7 +324,7 @@ pub struct Comparison {
 
 impl Comparison {
     /// Gets the previous commit before `a`
-    pub fn prev(&self, master_commits: &[rustc_artifacts::Commit]) -> Option<String> {
+    pub fn prev(&self, master_commits: &[collector::MasterCommit]) -> Option<String> {
         match &self.a_id {
             ArtifactId::Commit(a) => master_commits
                 .iter()
@@ -338,7 +338,7 @@ impl Comparison {
     pub async fn is_contiguous(
         &self,
         conn: &dyn database::Connection,
-        master_commits: &[rustc_artifacts::Commit],
+        master_commits: &[collector::MasterCommit],
     ) -> bool {
         match (&self.a_id, &self.b_id) {
             (ArtifactId::Commit(a), ArtifactId::Commit(b)) => {
@@ -353,7 +353,7 @@ impl Comparison {
     }
 
     /// Gets the sha of the next commit after `b`
-    pub fn next(&self, master_commits: &[rustc_artifacts::Commit]) -> Option<String> {
+    pub fn next(&self, master_commits: &[collector::MasterCommit]) -> Option<String> {
         match &self.b_id {
             ArtifactId::Commit(b) => master_commits
                 .iter()

site/src/comparison.rs

@@ -147,7 +147,7 @@ impl InputData {
     pub async fn missing_commits(&self) -> Vec<(Commit, MissingReason)> {
         let conn = self.conn().await;
         let (master_commits, queued_commits, in_progress_artifacts) = futures::join!(
-            rustc_artifacts::master_commits(),
+            collector::master_commits(),
             conn.queued_commits(),
             conn.in_progress_artifacts()
         );

site/src/load.rs

@@ -67,7 +67,7 @@ async fn main() {
     futures::pin_mut!(fut);
     loop {
         futures::select! {
-            s = server => {
+            _s = server => {
                 eprintln!("Server completed unexpectedly.");
                 return;
             }

site/src/main.rs

@@ -130,7 +130,7 @@ pub fn generate(pieces: super::Pieces, opt: Opt) -> anyhow::Result<Vec<u8>> {
 
     let mut seq = serializer.serialize_seq(None)?;
 
-    let data = ProfilingData::from_buffers(pieces.string_data, pieces.string_index, pieces.events)
+    let data = ProfilingData::from_buffers(pieces.string_data, pieces.string_index, pieces.events, None)
         .map_err(|e| anyhow::format_err!("{:?}", e))?;
 
     let thread_to_collapsed_thread =

site/src/self_profile/crox.rs

@@ -7,7 +7,7 @@ pub struct Opt {}
 
 pub fn generate(title: &str, pieces: super::Pieces, _: Opt) -> anyhow::Result<Vec<u8>> {
     let profiling_data =
-        ProfilingData::from_buffers(pieces.string_data, pieces.string_index, pieces.events)
+        ProfilingData::from_buffers(pieces.string_data, pieces.string_index, pieces.events, None)
             .map_err(|e| anyhow::format_err!("{:?}", e))?;
 
     let recorded_stacks = collapse_stacks(&profiling_data)