bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Some work

Browse source
This commit is contained in:
Aaron Hill 2020-10-18 15:28:23 -04:00
parent 23018a55d9
commit 6bdb4e3206
No known key found for this signature in database
GPG key ID: B4087E510E98B164
7 changed files with 42 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_errors/src/json.rs
View file

@ -145,10 +145,11 @@ impl Emitter for JsonEmitter {
}
})
.collect();
let report = FutureIncompatReport { future_incompat_report: data };
let result = if self.pretty {
writeln!(&mut self.dst, "{}", as_pretty_json(&data))
writeln!(&mut self.dst, "{}", as_pretty_json(&report))
} else {
writeln!(&mut self.dst, "{}", as_json(&data))
writeln!(&mut self.dst, "{}", as_json(&report))
}
.and_then(|_| self.dst.flush());
if let Err(e) = result {
@ -254,6 +255,11 @@ struct FutureBreakageItem {
diagnostic: Diagnostic,
}
#[derive(Encodable)]
struct FutureIncompatReport {
future_incompat_report: Vec<FutureBreakageItem>,
}
impl Diagnostic {
fn from_errors_diagnostic(diag: &crate::Diagnostic, je: &JsonEmitter) -> Diagnostic {
let sugg = diag.suggestions.iter().map(|sugg| Diagnostic {