mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handler tweaks.

Browse Source 
- Avoid unnecessary `inner` local variables.
- Use `borrow_mut` everywhere (instead of the synonym `lock`).
This commit is contained in:
Nicholas Nethercote 2023-12-01 08:23:34 +11:00
parent cb91235131
commit 6e9573936f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/rustc_errors/src/lib.rs
View File

@ -648,7 +648,7 @@ impl Handler {
// This is here to not allow mutation of flags; // This is here to not allow mutation of flags;
// as of this writing it's only used in tests in librustc_middle. // as of this writing it's only used in tests in librustc_middle.
pub fn can_emit_warnings(&self) -> bool { pub fn can_emit_warnings(&self) -> bool {
self.inner.lock().flags.can_emit_warnings self.inner.borrow_mut().flags.can_emit_warnings
} }
/// Resets the diagnostic error count as well as the cached emitted diagnostics. /// Resets the diagnostic error count as well as the cached emitted diagnostics.
@ -675,14 +675,13 @@ impl Handler {
/// Stash a given diagnostic with the given `Span` and [`StashKey`] as the key. /// Stash a given diagnostic with the given `Span` and [`StashKey`] as the key.
/// Retrieve a stashed diagnostic with `steal_diagnostic`. /// Retrieve a stashed diagnostic with `steal_diagnostic`.
pub fn stash_diagnostic(&self, span: Span, key: StashKey, diag: Diagnostic) { pub fn stash_diagnostic(&self, span: Span, key: StashKey, diag: Diagnostic) {
let mut inner = self.inner.borrow_mut(); self.inner.borrow_mut().stash((span.with_parent(None), key), diag);
inner.stash((span.with_parent(None), key), diag);
} }
/// Steal a previously stashed diagnostic with the given `Span` and [`StashKey`] as the key. /// Steal a previously stashed diagnostic with the given `Span` and [`StashKey`] as the key.
pub fn steal_diagnostic(&self, span: Span, key: StashKey) -> Option<DiagnosticBuilder<'_, ()>> { pub fn steal_diagnostic(&self, span: Span, key: StashKey) -> Option<DiagnosticBuilder<'_, ()>> {
let mut inner = self.inner.borrow_mut(); self.inner
inner .borrow_mut()
.steal((span.with_parent(None), key)) .steal((span.with_parent(None), key))
.map(|diag| DiagnosticBuilder::new_diagnostic(self, diag)) .map(|diag| DiagnosticBuilder::new_diagnostic(self, diag))
} }
@ -1197,8 +1196,7 @@ impl Handler {
mut diag: Diagnostic, mut diag: Diagnostic,
sp: impl Into<MultiSpan>, sp: impl Into<MultiSpan>,
) -> Option<ErrorGuaranteed> { ) -> Option<ErrorGuaranteed> {
let mut inner = self.inner.borrow_mut(); self.inner.borrow_mut().emit_diagnostic(diag.set_span(sp))
inner.emit_diagnostic(diag.set_span(sp))
} }
pub fn emit_artifact_notification(&self, path: &Path, artifact_type: &str) { pub fn emit_artifact_notification(&self, path: &Path, artifact_type: &str) {
@ -1266,7 +1264,7 @@ impl Handler {
} }
pub fn flush_delayed(&self) { pub fn flush_delayed(&self) {
let mut inner = self.inner.lock(); let mut inner = self.inner.borrow_mut();
let bugs = std::mem::replace(&mut inner.span_delayed_bugs, Vec::new()); let bugs = std::mem::replace(&mut inner.span_delayed_bugs, Vec::new());
inner.flush_delayed(bugs, "no errors encountered even though `span_delayed_bug` issued"); inner.flush_delayed(bugs, "no errors encountered even though `span_delayed_bug` issued");
} }