Skip to content

Miscellaneous diagnostics cleanups #120571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 14 commits into from
Feb 4, 2024
Merged

Miscellaneous diagnostics cleanups #120571

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3434466
Tweak `emit_stashed_diagnostics`.
nnethercote Jan 15, 2024
3db37fb
A small fix in `enforce_slug_naming.rs`.
nnethercote Jan 30, 2024
26eb6da
Fit more values into `DiagnosticArgValue::Number`.
nnethercote Jan 30, 2024
2621f7f
Rework `StringPart`.
nnethercote Jan 30, 2024
54c4f94
Make some fatal errors more concise.
nnethercote Feb 1, 2024
585367f
Remove an out-of-date comment.
nnethercote Feb 1, 2024
a9a2e15
`Diagnostic` cleanups
nnethercote Feb 1, 2024
8ba25d0
`SilentEmitter::fatal_note` doesn't need to be optional.
nnethercote Feb 1, 2024
df322fc
Remove some unnecessary `clone` calls.
nnethercote Feb 1, 2024
6fdaf3e
Use `DiagnosticArgName` in a few more places.
nnethercote Feb 1, 2024
cd4c5cd
Improve a local variable name.
nnethercote Feb 1, 2024
b506cce
Fix an incorrect comment.
nnethercote Feb 1, 2024
0621cd4
Simplify future breakage control flow.
nnethercote Feb 2, 2024
be64802
Use `StringPart` more.
nnethercote Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions compiler/rustc_errors/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,9 +1224,8 @@ impl DiagCtxtInner {
/// Emit all stashed diagnostics.
fn emit_stashed_diagnostics(&mut self) -> Option<ErrorGuaranteed> {
let has_errors = self.has_errors();
let diags = self.stashed_diagnostics.drain(..).map(|x| x.1).collect::<Vec<_>>();
let mut reported = None;
for diag in diags {
for (_, diag) in std::mem::take(&mut self.stashed_diagnostics).into_iter() {
// Decrement the count tracking the stash; emitting will increment it.
if diag.is_error() {
if diag.is_lint.is_some() {
Expand Down