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

Move rustc_interface diagnostics to struct SessionDiagnostic derives

Browse source
This commit is contained in:
Giacomo Stevanato 2022-08-20 18:33:02 +02:00
parent e4403ae9ff
commit b411adec2a
4 changed files with 137 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/rustc_interface/src/queries.rs
View file

@ -1,3 +1,4 @@
use crate::errors::{FailedWritingFile, RustcErrorFatal, RustcErrorUnexpectedAnnotation};
use crate::interface::{Compiler, Result};
use crate::passes::{self, BoxedResolver, QueryContext};
@ -274,18 +275,14 @@ impl<'tcx> Queries<'tcx> {
// Bare `#[rustc_error]`.
None => {
tcx.sess.span_fatal(
tcx.def_span(def_id),
"fatal error triggered by #[rustc_error]",
);
tcx.sess.emit_fatal(RustcErrorFatal { span: tcx.def_span(def_id) });
}
// Some other attribute.
Some(_) => {
tcx.sess.span_warn(
tcx.def_span(def_id),
"unexpected annotation used with `#[rustc_error(...)]!",
);
tcx.sess.emit_warning(RustcErrorUnexpectedAnnotation {
span: tcx.def_span(def_id),
});
}
}
}
@ -361,7 +358,10 @@ impl Linker {
let encoded = CodegenResults::serialize_rlink(&codegen_results);
let rlink_file = self.prepare_outputs.with_extension(config::RLINK_EXT);
std::fs::write(&rlink_file, encoded).map_err(|err| {
sess.fatal(&format!("failed to write file {}: {}", rlink_file.display(), err));
sess.emit_fatal(FailedWritingFile {
path: (&rlink_file.display()).into(),
error: (&err).into(),
})
})?;
return Ok(());
}