Report total bootstrap time correctly on compare page

Author: Mark-Simulacrum

site/src/comparison.rs

@@ -460,7 +460,16 @@ impl ArtifactDescription {
         let bootstrap = conn
             .get_bootstrap_by_crate(&[conn.artifact_id(&artifact).await])
             .await;
-        let bootstrap = bootstrap
+        let total_bootstrap = bootstrap
+            .values()
+            .filter_map(|v| {
+                v.get(0)
+                    .copied()
+                    .unwrap_or_default()
+                    .map(|v| v.as_nanos() as u64)
+            })
+            .sum::<u64>();
+        let mut bootstrap = bootstrap
             .into_iter()
             .filter_map(|(k, mut v)| {
                 v.pop()
@@ -478,6 +487,8 @@ impl ArtifactDescription {
             })
             .collect::<HashMap<_, _>>();
 
+        bootstrap.insert("$total".to_owned(), total_bootstrap);
+
         let pr = if let ArtifactId::Commit(c) = &artifact {
             if let Some(m) = master_commits.iter().find(|m| m.sha == c.sha) {
                 m.pr

site/static/compare.html

@@ -610,9 +610,8 @@ <h2>Comparing <span id="stat-header">{{stat}}</span> between <span id="before">{
                     return testCases;
                 },
                 bootstrapTotals() {
-                    const sum = bootstrap => Object.entries(bootstrap).map(e => e[1] / 1e9).reduce((sum, next) => sum + next, 0);
-                    const a = sum(this.data.a.bootstrap);
-                    const b = sum(this.data.b.bootstrap);
+                    const a = this.data.a.bootstrap["$total"] / 1e9;
+                    const b = this.data.b.bootstrap["$total"] / 1e9;
                     return { a, b };
                 },
                 bootstraps() {
@@ -628,7 +627,9 @@ <h2>Comparing <span id="stat-header">{{stat}}</span> between <span id="before">{
                             b: format(b),
                             percent: 100 * (b - a) / a
                         };
-                    }).sort((a, b) => Math.abs(b.percent) - Math.abs(a.percent));
+                    })
+                    .filter(e => e.name != "$total")
+                    .sort((a, b) => Math.abs(b.percent) - Math.abs(a.percent));
                 },
                 before() {
                     if (!this.data) {
@@ -814,4 +815,4 @@ <h2>Comparing <span id="stat-header">{{stat}}</span> between <span id="before">{
     </script>
 </body>
 
-</html>
+</html>