user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't display empty future-compat report

Browse source
This commit is contained in:
Aaron Hill 2020-10-19 11:54:09 -04:00
parent 4621ce9858
commit 2f6e59d941
No known key found for this signature in database
GPG key ID: B4087E510E98B164
1 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/tools/compiletest/src/json.rs
View file

@ -94,22 +94,27 @@ pub fn extract_rendered(output: &str) -> String {
if let Ok(diagnostic) = serde_json::from_str::<Diagnostic>(line) {
diagnostic.rendered
} else if let Ok(report) = serde_json::from_str::<FutureIncompatReport>(line) {
Some(format!(
"Future incompatibility report: {}",
report
.future_incompat_report
.into_iter()
.map(|item| {
format!(
"Future breakage date: {}, diagnostic:\n{}",
item.future_breakage_date.unwrap_or_else(|| "None".to_string()),
item.diagnostic
.rendered
.unwrap_or_else(|| "Not rendered".to_string())
)
})
.collect::<String>()
))
if report.future_incompat_report.is_empty() {
None
} else {
Some(format!(
"Future incompatibility report: {}",
report
.future_incompat_report
.into_iter()
.map(|item| {
format!(
"Future breakage date: {}, diagnostic:\n{}",
item.future_breakage_date
.unwrap_or_else(|| "None".to_string()),
item.diagnostic
.rendered
.unwrap_or_else(|| "Not rendered".to_string())
)
})
.collect::<String>()
))
}
} else if serde_json::from_str::<ArtifactNotification>(line).is_ok() {
// Ignore the notification.
None