Merge pull request #1407 from rust-lang/fix-bootstrap-master-commits

Only display master commits in bootstrap chart

Author: rylev

database/src/lib.rs

@@ -178,6 +178,9 @@ impl Commit {
     pub fn is_try(&self) -> bool {
         matches!(self.r#type, CommitType::Try)
     }
+    pub fn is_master(&self) -> bool {
+        matches!(self.r#type, CommitType::Master)
+    }
 }
 
 impl hash::Hash for Commit {

site/src/request_handlers/bootstrap.rs

@@ -12,7 +12,11 @@ pub async fn handle_bootstrap(
 ) -> ServerResult<bootstrap::Response> {
     log::info!("handle_bootstrap({:?})", body);
     let range = ctxt.data_range(body.start.clone()..=body.end.clone());
-    let commits: Vec<ArtifactId> = range.iter().map(|c| c.clone().into()).collect();
+    let commits: Vec<ArtifactId> = range
+        .into_iter()
+        .filter(|c| c.is_master())
+        .map(|c| c.into())
+        .collect();
 
     let conn = ctxt.conn().await;
     let ids = commits

site/src/request_handlers/graph.rs

@@ -1,5 +1,4 @@
 use collector::Bound;
-use database::CommitType;
 use std::collections::HashMap;
 use std::sync::Arc;
 
@@ -149,9 +148,7 @@ fn artifact_ids_for_range(ctxt: &SiteCtxt, start: Bound, end: Bound) -> Vec<Arti
     range
         .into_iter()
         .enumerate()
-        .filter(|(index, commit)| {
-            *index == 0 || *index == count - 1 || matches!(commit.r#type, CommitType::Master)
-        })
+        .filter(|(index, commit)| *index == 0 || *index == count - 1 || commit.is_master())
         .map(|c| c.1.into())
         .collect()
 }