From cb68c051511fe0583ecf3f39147b8537a26c1e1f Mon Sep 17 00:00:00 2001
From: Pietro Albini <pietro.albini@ferrous-systems.com>
Date: Fri, 26 May 2023 09:47:21 +0200
Subject: [PATCH] address review feedback

---
 src/bootstrap/metrics.rs | 8 +++-----
 src/bootstrap/test.rs    | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/bootstrap/metrics.rs b/src/bootstrap/metrics.rs
index 9f68eea9a5e..8aa821a3afc 100644
--- a/src/bootstrap/metrics.rs
+++ b/src/bootstrap/metrics.rs
@@ -114,9 +114,7 @@ impl BuildMetrics {
         if let Some(test_suite) = step.test_suites.last_mut() {
             test_suite.tests.push(Test { name: name.to_string(), outcome });
         } else {
-            panic!(
-                "metrics.record_test() called without calling metrics.record_test_suite() first"
-            );
+            panic!("metrics.record_test() called without calling metrics.begin_test_suite() first");
         }
     }
 
@@ -194,7 +192,7 @@ impl BuildMetrics {
     fn prepare_json_step(&self, step: StepMetrics) -> JsonNode {
         let mut children = Vec::new();
         children.extend(step.children.into_iter().map(|child| self.prepare_json_step(child)));
-        children.extend(step.test_suites.into_iter().map(|suite| JsonNode::TestSuite(suite)));
+        children.extend(step.test_suites.into_iter().map(JsonNode::TestSuite));
 
         JsonNode::RustbuildStep {
             type_: step.type_,
@@ -277,7 +275,7 @@ struct TestSuite {
 #[derive(Serialize, Deserialize)]
 #[serde(tag = "kind", rename_all = "snake_case")]
 pub(crate) enum TestSuiteMetadata {
-    Crate {
+    CargoPackage {
         crates: Vec<String>,
         target: String,
         host: String,
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index f64b5f96523..29edbe5ae41 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -319,7 +319,7 @@ impl Step for Cargo {
 
         #[cfg(feature = "build-metrics")]
         builder.metrics.begin_test_suite(
-            crate::metrics::TestSuiteMetadata::Crate {
+            crate::metrics::TestSuiteMetadata::CargoPackage {
                 crates: vec!["cargo".into()],
                 target: self.host.triple.to_string(),
                 host: self.host.triple.to_string(),
@@ -2135,7 +2135,7 @@ fn run_cargo_test(
 
     #[cfg(feature = "build-metrics")]
     builder.metrics.begin_test_suite(
-        crate::metrics::TestSuiteMetadata::Crate {
+        crate::metrics::TestSuiteMetadata::CargoPackage {
             crates: crates.iter().map(|c| c.to_string()).collect(),
             target: target.triple.to_string(),
             host: compiler.host.triple.to_string(),