Skip to content

Rollup of 6 pull requests #112016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 20 commits into from
May 27, 2023
Merged

Rollup of 6 pull requests #112016

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3c9b076
include test suite metadata in build metrics
pietroalbini May 25, 2023
0553f71
introduce build metrics version numbers to handle breaking changes
pietroalbini May 25, 2023
844c1cc
Remove DesugaringKind::Replace.
cjgillot May 25, 2023
e1b8fad
Add #[inline] to array TryFrom impls
saethlin May 25, 2023
cb68c05
address review feedback
pietroalbini May 26, 2023
7040d41
rename metadata_version to format_version
pietroalbini May 26, 2023
c5139b9
add reasoning for introducing a metrics format version
pietroalbini May 26, 2023
3802ba0
Fix re-export of doc hidden macro not showing up
GuillaumeGomez May 26, 2023
c908d1e
Update tests for re-exports of doc hidden macros
GuillaumeGomez May 26, 2023
898dfc6
Correctly handle multiple re-exports of bang macros at the same level
GuillaumeGomez May 26, 2023
1a77d9a
rustdoc: get unnormalized link destination for suggestions
notriddle May 27, 2023
a25aee1
Perform MIR type ops locally in new solver
compiler-errors May 25, 2023
d7a2fdd
Uplift complex type ops back into typeck so we can call them locally
compiler-errors May 25, 2023
c4e8a86
Don't use outlives type op outside of MIR typeck
compiler-errors May 25, 2023
859068c
Rollup merge of #111936 - ferrocene:pa-test-suite-metadata, r=jyn514
GuillaumeGomez May 27, 2023
ddb5424
Rollup merge of #111952 - cjgillot:drop-replace, r=WaffleLapkin
GuillaumeGomez May 27, 2023
b2abb2b
Rollup merge of #111966 - saethlin:inline-slice-tryfrom, r=thomcc
GuillaumeGomez May 27, 2023
cd8132b
Rollup merge of #111983 - compiler-errors:type-op-locally, r=lcnr
GuillaumeGomez May 27, 2023
480ac69
Rollup merge of #111997 - GuillaumeGomez:re-export-doc-hidden-macros,…
GuillaumeGomez May 27, 2023
3089653
Rollup merge of #112014 - notriddle:notriddle/intra-doc-weird-syntax,…
GuillaumeGomez May 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
address review feedback
  • Loading branch information
@pietroalbini
pietroalbini committed May 26, 2023
commit cb68c051511fe0583ecf3f39147b8537a26c1e1f
8 changes: 3 additions & 5 deletions src/bootstrap/metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}

Expand Down Expand Up @@ -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_,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/bootstrap/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down