Cleanup error handlers: round 4 #119171
Merged
Cleanup error handlers: round 4 #119171
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-meta
|
Some changes occurred to the CTFE / Miri engine cc @rust-lang/miri Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt
cc @davidtwco, @compiler-errors, @TaKO8Ki Some changes occurred in src/tools/rustfmt cc @rust-lang/rustfmt Some changes occurred in compiler/rustc_codegen_cranelift cc @bjorn3 Some changes occurred in compiler/rustc_codegen_gcc Some changes occurred in need_type_info.rs cc @lcnr Some changes might have occurred in exhaustiveness checking cc @Nadrieril |
|
☔ The latest upstream changes (presumably #119097) made this pull request unmergeable. Please resolve the merge conflicts. |
nnethercote
force-pushed
the
cleanup-errors-4
branch
from
aa1eeef to
4bea661
Compare
|
The Miri subtree was changed cc @rust-lang/miri |
|
Lots of commits, but they're mostly small and all self-contained. |
compiler/rustc_errors/src/lib.rs
Outdated
| Bug, | ||
|
|
||
| /// This is a strange one: lets you register an error without emitting it. If compilation ends | ||
| /// without any other errors occurring, this will be emitted as an error. Otherwise, it will be |
There was a problem hiding this comment.
this will be emitted as an error
It will be emitted as a bug, I though?
There was a problem hiding this comment.
We have some unclear terminology. Sometimes "error" means Level::Error and sometimes it means Level::{BugDelayed,Fatal,Error,FailureNote}, e.g. here.
But even with that in mind, this is a clumsy sentence, I'll fix it up in a minute.
|
@bors r+ |
bors
added
S-waiting-on-bors
nnethercote
force-pushed
the
cleanup-errors-4
branch
from
4bea661 to
fbfe0e7
Compare
|
I fixed the comment. @bors r=compiler-errors |
|
☔ The latest upstream changes (presumably #118824) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
There is room for improvement on some of these, but something is better than nothing.
We can just get the error level in the `match` and then use `DiagnosticBuilder::new`. This then means a number of `DiagCtxt` functions are no longer needed, because this was the one place that used them. Note: the commit changes the treatment of spans for `Expect`, which was different to all the other cases, but this has no apparent effect.
There are a bunch of them about 400 lines down, which is weird and annoying. This commit moves them up and puts them in a more sensible order.
`IntoDiagnostic` defaults to `G = ErrorGuaranteed`. Take advantage of this in one place that currently doesn't.
Its single use can be replaced with `Diagnostic::new_with_messages`.
Lots of vectors of messages called `message` or `msg`. This commit pluralizes them. Note that `emit_message_default` and `emit_messages_default` both already existed, and both process a vector, so I renamed the former `emit_messages_default_inner` because it's called by the latter.
They're always `None`.
It's only ever set to `None`.
It has three variants, but only `LabelKind::Label` is ever used. This means `SingleLabelManySpans::kind` can also be removed.
Some of the `Level::` qualifiers in this file are omitted. This commit removes the remainder.
There are quite a few hand-written `IntoDiagnostic` impls.
There are only three. It's simpler to make the type `DiagnosticBuilder<'_, ()>` from the start, no matter the level, than to change the guarantee later.
It's unused. And this means `DiagnosticBuilderInner` no longer needs to be separate from `DiagnosticBuilder`.
nnethercote
force-pushed
the
cleanup-errors-4
branch
from
fbfe0e7 to
2cd14bc
Compare
|
I fixed the conflicts. @bors r=compiler-errors |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 23, 2023
…mpiler-errors Rollup of 6 pull requests Successful merges: - rust-lang#119012 (Extract `layout_of_{struct,enum}` fn) - rust-lang#119077 (Separate MIR lints from validation) - rust-lang#119171 (Cleanup error handlers: round 4) - rust-lang#119198 (Split coroutine desugaring kind from source) - rust-lang#119222 (Add `IntoAsyncIterator`) - rust-lang#119230 (Exhaustiveness: clean up after librarification) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 23, 2023
Rollup merge of rust-lang#119171 - nnethercote:cleanup-errors-4, r=compiler-errors Cleanup error handlers: round 4 More `rustc_errors` cleanups. A sequel to rust-lang#118933. r? `@compiler-errors`
bjorn3
pushed a commit
to bjorn3/rust
that referenced
this pull request
Dec 24, 2023
…mpiler-errors Cleanup error handlers: round 4 More `rustc_errors` cleanups. A sequel to rust-lang#118933. r? `@compiler-errors`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 5, 2024
…mpiler-errors Cleanup error handlers: round 5 More rustc_errors cleanups. A sequel to rust-lang#119171. r? `@compiler-errors`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 5, 2024
…mpiler-errors Cleanup error handlers: round 5 More rustc_errors cleanups. A sequel to rust-lang#119171. r? ``@compiler-errors``
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Jan 5, 2024
…mpiler-errors Cleanup error handlers: round 5 More rustc_errors cleanups. A sequel to rust-lang#119171. r? ```@compiler-errors```
compiler-errors
added a commit
to compiler-errors/rust
that referenced
this pull request
Jan 5, 2024
…mpiler-errors Cleanup error handlers: round 5 More rustc_errors cleanups. A sequel to rust-lang#119171. r? ````@compiler-errors````
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 5, 2024
Rollup merge of rust-lang#119538 - nnethercote:cleanup-errors-5, r=compiler-errors Cleanup error handlers: round 5 More rustc_errors cleanups. A sequel to rust-lang#119171. r? ````@compiler-errors````
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Jan 6, 2024
…rors Cleanup error handlers: round 5 More rustc_errors cleanups. A sequel to rust-lang/rust#119171. r? ````@compiler-errors````
GuillaumeGomez
pushed a commit
to GuillaumeGomez/rustc_codegen_gcc
that referenced
this pull request
Feb 15, 2024
…rors Cleanup error handlers: round 5 More rustc_errors cleanups. A sequel to rust-lang/rust#119171. r? ````@compiler-errors````
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
More
rustc_errorscleanups. A sequel to #118933.r? @compiler-errors