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

Give TRACK_DIAGNOSTIC a return value.

Browse source 
This means `DiagCtxtInner::emit_diagnostic` can return its result
directly, rather than having to modify a local variable.
This commit is contained in:
Nicholas Nethercote 2024-02-09 16:16:22 +11:00
parent 1a1876c979
commit bf62d5913a
2 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_interface/src/callbacks.rs
View file

@ -29,7 +29,7 @@ fn track_span_parent(def_id: rustc_span::def_id::LocalDefId) {
/// This is a callback from `rustc_errors` as it cannot access the implicit state
/// in `rustc_middle` otherwise. It is used when diagnostic messages are
/// emitted and stores them in the current query, if there is one.
fn track_diagnostic(diagnostic: DiagInner, f: &mut dyn FnMut(DiagInner)) {
fn track_diagnostic<R>(diagnostic: DiagInner, f: &mut dyn FnMut(DiagInner) -> R) -> R {
tls::with_context_opt(|icx| {
if let Some(icx) = icx {
if let Some(diagnostics) = icx.diagnostics {
@ -38,11 +38,11 @@ fn track_diagnostic(diagnostic: DiagInner, f: &mut dyn FnMut(DiagInner)) {
// Diagnostics are tracked, we can ignore the dependency.
let icx = tls::ImplicitCtxt { task_deps: TaskDepsRef::Ignore, ..icx.clone() };
return tls::enter_context(&icx, move || (*f)(diagnostic));
tls::enter_context(&icx, move || (*f)(diagnostic))
} else {
// In any other case, invoke diagnostics anyway.
(*f)(diagnostic)
}
// In any other case, invoke diagnostics anyway.
(*f)(diagnostic);
})
}