Skip to content

Cleanup error handlers #118470

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 15 commits into from
Dec 2, 2023
Merged

Cleanup error handlers #118470

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f7e3d05
Inline and remove `DiagnosticBuilder::new_diagnostic_fatal`.
nnethercote Nov 30, 2023
b2a856e
Return `ErrorGuaranteed` from `span_err_with_code` methods.
nnethercote Nov 30, 2023
95be8b2
Remove an unnecessary local variable.
nnethercote Nov 30, 2023
7138845
Rename `Handler::span_note_diag` as `struct_span_note`.
nnethercote Nov 30, 2023
c3628bb
Rename `HandlerInner::failure` as `HandlerInner::failure_note`.
nnethercote Nov 30, 2023
57d6f84
Rename `*note_without_error` as `*note`.
nnethercote Nov 30, 2023
5d1d384
Rename `HandlerInner::delay_span_bug` as `HandlerInner::span_delayed_…
nnethercote Nov 30, 2023
2c337a0
Rename `HandlerInner::delayed_span_bugs` as `HandlerInner::span_delay…
nnethercote Nov 30, 2023
c9008c6
Rename `Handler::delay_good_path_bug` as `Handler::good_path_delayed_…
nnethercote Nov 30, 2023
cb91235
Rename `LayoutCalculator::delay_bug` as `LayoutCalculator::delayed_bug`.
nnethercote Nov 30, 2023
6e95739
`Handler` tweaks.
nnethercote Nov 30, 2023
a179a53
Use `Session::diagnostic` in more places.
nnethercote Dec 1, 2023
31ac4ef
Use `Session::diagnostic` in more places.
nnethercote Dec 1, 2023
8be1d25
Remove unnecessary qualifiers.
nnethercote Dec 1, 2023
61f9356
Inline and remove `LoweringContext::handler()`.
nnethercote Dec 1, 2023
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
Prev Previous commit
Next Next commit
Return ErrorGuaranteed from span_err_with_code methods. 
`ErrorGuaranteed` should be used for all error methods involving the
`Error` level, e.g. as is done for the corresponding `span_err` methods.
  • Loading branch information
@nnethercote
nnethercote committed Dec 1, 2023
commit b2a856ea3cb0087e52f90a9ac7e4e32f0b52a66e
5 changes: 3 additions & 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 @@ -970,11 +970,12 @@ impl Handler {
span: impl Into<MultiSpan>,
msg: impl Into<DiagnosticMessage>,
code: DiagnosticId,
) {
) -> ErrorGuaranteed {
self.emit_diag_at_span(
Diagnostic::new_with_code(Error { lint: false }, Some(code), msg),
span,
);
)
.unwrap()
}

#[rustc_lint_diagnostics]
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_session/src/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ impl Session {
sp: S,
msg: impl Into<DiagnosticMessage>,
code: DiagnosticId,
) {
) -> ErrorGuaranteed {
self.diagnostic().span_err_with_code(sp, msg, code)
}
#[rustc_lint_diagnostics]
Expand Down