Cleanup error handlers #118470

nnethercote · 2023-11-30T05:28:57Z

Mostly by making function naming more consistent. More to do after this, but this is enough for one PR.

r? compiler-errors

rustbot · 2023-11-30T05:29:07Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes might have occurred in exhaustiveness checking

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Some changes occurred in const_evaluatable.rs

cc @BoxyUwU

lnicola · 2023-11-30T07:14:13Z

src/tools/rust-analyzer/crates/hir-ty/src/layout.rs

@@ -110,7 +110,7 @@ struct LayoutCx<'a> {
 impl<'a> LayoutCalculator for LayoutCx<'a> {
    type TargetDataLayoutRef = &'a TargetDataLayout;

-    fn delay_bug(&self, txt: String) {
+    fn delayed_bug(&self, txt: String) {


CC @Veykril this will be fun to handle.

EDIT: for context, when RA is built outside of rust-lang/rust, it uses a version ra_ap_rustc_abi from crates.io that gets published every Tuesday. So no need to do anything @nnethercote, we just have to be a little careful.

That particular commit isn't that important, so if it's a pain I can just remove it.

No, don't worry about it.

Isn't that only a problem when we do a sync while the changes haven't been pushed to crates io yet? fwiw we can change the autopublish time to be right before your usual sync times if you want

It is, but it's easy to patch when syncing back, then undo that when we upgrade to the published version.

rustbot · 2023-12-01T03:02:31Z

Some changes occurred in need_type_info.rs

cc @lcnr

nnethercote · 2023-12-01T03:02:59Z

I added a few more commits. I'll stop now, I promise :)

compiler/rustc_errors/src/lib.rs

It has a single call site.

`ErrorGuaranteed` should be used for all error methods involving the `Error` level, e.g. as is done for the corresponding `span_err` methods.

Because `span_note_diag` doesn't follow the naming structure used for the error reporting functions.

To match the `FailureNote` variant of `Level`.

Because the variant name in `Level` is `Note`, and the `without_error` suffix is omitted in similar cases like `struct_allow` and `struct_help`.

…bug`. Because the corresponding `Level` is `DelayedBug` and `span_delayed_bug` follows the pattern used everywhere else: `span_err`, `span_warning`, etc.

…ed_bugs`. For reasons similar to the previous commit.

…bug`. In line with the previous commits.

To match with the previous commits.

- Avoid unnecessary `inner` local variables. - Use `borrow_mut` everywhere (instead of the synonym `lock`).

It has a single call site.

nnethercote · 2023-12-01T22:09:56Z

I added the requested comment.

nnethercote · 2023-12-01T22:10:03Z

@bors r=compiler-errors

bors · 2023-12-01T22:10:06Z

📌 Commit 61f9356 has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2023-12-02T02:48:38Z

⌛ Testing commit 61f9356 with merge 2da59b8...

bors · 2023-12-02T04:51:27Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 2da59b8 to master...

rust-timer · 2023-12-02T06:14:12Z

Finished benchmarking commit (2da59b8): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	2.5%	[2.5%, 2.5%]	1
Regressions ❌ (secondary)	2.1%	[1.3%, 2.9%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.5%	[2.5%, 2.5%]	1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 672.083s -> 671.012s (-0.16%)
Artifact size: 313.95 MiB -> 313.93 MiB (-0.01%)

rust-lang/rust#118470

…-2, r=compiler-errors Cleanup error handlers some more A sequel to rust-lang#118470. r? `@compiler-errors`

…-2, r=compiler-errors Cleanup error handlers some more A sequel to rust-lang#118470. r? ``@compiler-errors``

…-2, r=compiler-errors Cleanup error handlers some more A sequel to rust-lang#118470. r? ```@compiler-errors```

Rollup merge of rust-lang#118587 - nnethercote:cleanup-error-handlers-2, r=compiler-errors Cleanup error handlers some more A sequel to rust-lang#118470. r? ```@compiler-errors```

…r=compiler-errors Cleanup error handlers Mostly by making function naming more consistent. More to do after this, but this is enough for one PR. r? compiler-errors

rustbot assigned compiler-errors Nov 30, 2023

lnicola reviewed Nov 30, 2023

View reviewed changes

compiler-errors approved these changes Dec 1, 2023

View reviewed changes

compiler/rustc_errors/src/lib.rs Show resolved Hide resolved

nnethercote added 15 commits December 2, 2023 08:58

Inline and remove DiagnosticBuilder::new_diagnostic_fatal.

f7e3d05

It has a single call site.

Return ErrorGuaranteed from span_err_with_code methods.

b2a856e

`ErrorGuaranteed` should be used for all error methods involving the `Error` level, e.g. as is done for the corresponding `span_err` methods.

Remove an unnecessary local variable.

95be8b2

Rename Handler::span_note_diag as struct_span_note.

7138845

Because `span_note_diag` doesn't follow the naming structure used for the error reporting functions.

Rename HandlerInner::failure as HandlerInner::failure_note.

c3628bb

To match the `FailureNote` variant of `Level`.

Rename *note_without_error as *note.

57d6f84

Because the variant name in `Level` is `Note`, and the `without_error` suffix is omitted in similar cases like `struct_allow` and `struct_help`.

Rename HandlerInner::delay_span_bug as `HandlerInner::span_delayed_…

5d1d384

…bug`. Because the corresponding `Level` is `DelayedBug` and `span_delayed_bug` follows the pattern used everywhere else: `span_err`, `span_warning`, etc.

Rename HandlerInner::delayed_span_bugs as `HandlerInner::span_delay…

2c337a0

…ed_bugs`. For reasons similar to the previous commit.

Rename Handler::delay_good_path_bug as `Handler::good_path_delayed_…

c9008c6

…bug`. In line with the previous commits.

Rename LayoutCalculator::delay_bug as LayoutCalculator::delayed_bug.

cb91235

To match with the previous commits.

Handler tweaks.

6e95739

- Avoid unnecessary `inner` local variables. - Use `borrow_mut` everywhere (instead of the synonym `lock`).

Use Session::diagnostic in more places.

a179a53

Use Session::diagnostic in more places.

31ac4ef

Remove unnecessary qualifiers.

8be1d25

Inline and remove LoweringContext::handler().

61f9356

It has a single call site.

nnethercote force-pushed the cleanup-error-handlers branch from 40d6f9f to 61f9356 Compare December 1, 2023 22:09

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 1, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 2, 2023

bors merged commit 2da59b8 into rust-lang:master Dec 2, 2023
12 checks passed

rustbot added this to the 1.76.0 milestone Dec 2, 2023

bors mentioned this pull request Dec 2, 2023

Collect lang items from AST, get rid of GenericBound::LangItemTrait #118396

Merged

xFrednet mentioned this pull request Dec 2, 2023

Chore: Bump nightly -> 2023-12-28 rust-marker/marker#315

Open

matthiaskrgr added a commit to matthiaskrgr/icemaker that referenced this pull request Dec 2, 2023

update delay_span_bug -> span_delayed_bug rename

ced8d7c

rust-lang/rust#118470

nnethercote deleted the cleanup-error-handlers branch December 3, 2023 10:34

nnethercote mentioned this pull request Dec 4, 2023

Cleanup error handlers some more #118587

Merged

compiler-errors added a commit to compiler-errors/rust that referenced this pull request Dec 5, 2023

Rollup merge of rust-lang#118587 - nnethercote:cleanup-error-handlers…

7c09391

…-2, r=compiler-errors Cleanup error handlers some more A sequel to rust-lang#118470. r? `@compiler-errors`

compiler-errors added a commit to compiler-errors/rust that referenced this pull request Dec 5, 2023

Rollup merge of rust-lang#118587 - nnethercote:cleanup-error-handlers…

0f0615c

…-2, r=compiler-errors Cleanup error handlers some more A sequel to rust-lang#118470. r? ``@compiler-errors``

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cleanup error handlers #118470

Cleanup error handlers #118470

nnethercote commented Nov 30, 2023

rustbot commented Nov 30, 2023

lnicola Nov 30, 2023 •

edited

Loading

nnethercote Nov 30, 2023

lnicola Nov 30, 2023

Veykril Nov 30, 2023

lnicola Nov 30, 2023

rustbot commented Dec 1, 2023

nnethercote commented Dec 1, 2023

nnethercote commented Dec 1, 2023

nnethercote commented Dec 1, 2023

bors commented Dec 1, 2023

bors commented Dec 2, 2023

bors commented Dec 2, 2023

rust-timer commented Dec 2, 2023

Cleanup error handlers #118470

Cleanup error handlers #118470

Conversation

nnethercote commented Nov 30, 2023

rustbot commented Nov 30, 2023

lnicola Nov 30, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rustbot commented Dec 1, 2023

nnethercote commented Dec 1, 2023

nnethercote commented Dec 1, 2023

nnethercote commented Dec 1, 2023

bors commented Dec 1, 2023

bors commented Dec 2, 2023

bors commented Dec 2, 2023

rust-timer commented Dec 2, 2023

Overall result: no relevant changes - no action needed

lnicola Nov 30, 2023 •

edited

Loading