mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

address review feedback

Browse Source
This commit is contained in:
Pietro Albini 2023-05-26 09:47:21 +02:00
parent 0553f71b1b
commit cb68c05151
No known key found for this signature in database
GPG Key ID: CD76B35F7734769E
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bootstrap/metrics.rs
View File

@ -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,

4
src/bootstrap/test.rs
View File

@ -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(),