bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #119097 - nnethercote:fix-EmissionGuarantee, r=compiler-errors

Browse source 
Fix `EmissionGuarantee`

There are some problems with the `DiagCtxt` API related to `EmissionGuarantee`. This PR fixes them.

r? `@compiler-errors`
This commit is contained in:
bors 2023-12-22 00:03:57 +00:00
commit cee794ee98
45 changed files with 605 additions and 701 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_expand/src/base.rs
View file

@ -1159,6 +1159,7 @@ impl<'a> ExtCtxt<'a> {
// Fixme: does this result in errors?
self.expansions.clear();
}
#[rustc_lint_diagnostics]
pub fn bug(&self, msg: &'static str) -> ! {
self.sess.dcx().bug(msg);
}
@ -1204,11 +1205,10 @@ pub fn resolve_path(
.expect("attempting to resolve a file path in an external file"),
FileName::DocTest(path, _) => path,
other => {
return Err(errors::ResolveRelativePath {
return Err(parse_sess.dcx.create_err(errors::ResolveRelativePath {
span,
path: parse_sess.source_map().filename_for_diagnostics(&other).to_string(),
}
.into_diagnostic(&parse_sess.dcx));
}));
}
};
result.pop();