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

Print future breakage report

Browse source
This commit is contained in:
Aaron Hill 2020-10-19 11:19:37 -04:00
parent 6bdb4e3206
commit a77a65c029
No known key found for this signature in database
GPG key ID: B4087E510E98B164
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -86,6 +86,13 @@ pub fn extract_rendered(output: &str) -> String {
if line.starts_with('{') {
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>()))
} else if serde_json::from_str::<ArtifactNotification>(line).is_ok() {
// Ignore the notification.
None
@ -105,14 +112,10 @@ pub fn extract_rendered(output: &str) -> String {
}
pub fn parse_output(file_name: &str, output: &str, proc_res: &ProcRes) -> Vec<Error> {
let lines = output.lines();
let last_line = lines.next_back();
lines.flat_map(|line| parse_line(file_name, line, output, proc_res, false)).chain(
last_line.into_iter().flat_map(|line| parse_line(file_name, line, output, proc_res, true))
).collect()
output.lines().flat_map(|line| parse_line(file_name, line, output, proc_res)).collect()
}
fn parse_line(file_name: &str, line: &str, output: &str, proc_res: &ProcRes, last_line: bool) -> Vec<Error> {
fn parse_line(file_name: &str, line: &str, output: &str, proc_res: &ProcRes) -> Vec<Error> {
// The compiler sometimes intermingles non-JSON stuff into the
// output. This hack just skips over such lines. Yuck.
if line.starts_with('{') {