Diagnostic renaming 3 #122132

nnethercote · 2024-03-07T09:06:56Z

A sequel to #121780.

r? @davidtwco

rustbot · 2024-03-07T09:07:07Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in exhaustiveness checking

cc @Nadrieril

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in need_type_info.rs

cc @lcnr

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @TaKO8Ki

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

rustc_macros::diagnostics was changed

cc @davidtwco, @compiler-errors, @TaKO8Ki

davidtwco

LGTM, one suggestion, can be ignored or a follow-up or a change here.

compiler/rustc_ast_lowering/src/errors.rs

nnethercote · 2024-03-08T02:23:48Z

New code is up, with some sizeable changes so I won't just r+ it myself.

Now derive(Diagnostic)/derive(Subdiagnostic)/derive(LintDiagnostic) are unchanged, but the corresponding trait names are changed to match the derive attributes:

trait IntoDiagnostic -> trait Diagnostic
trait AddToDiagnostic -> trait Subdiagnostic
trait DecorateLint -> trait LintDiagnostic

This also removes the need to rename various types, e.g. DiagnosticDeriveKind shouldn't be renamed DiagDeriveKind given that the trait/derive name is Diagnostic.

Overall this makes the change quite a bit smaller, which is nice.

davidtwco · 2024-03-08T09:51:32Z

@bors r+

bors · 2024-03-08T09:51:35Z

📌 Commit b91031a has been approved by davidtwco

It is now in the queue for this repository.

bors · 2024-03-08T12:58:07Z

☔ The latest upstream changes (presumably #122182) made this pull request unmergeable. Please resolve the merge conflicts.

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#121025 (add known-bug tests for derive failure to detect packed repr) - rust-lang#121194 (Refactor pre-getopts command line argument handling) - rust-lang#121563 (Use `ControlFlow` in visitors.) - rust-lang#122173 (Don't ICE in CTFE if raw/fn-ptr types differ) - rust-lang#122175 (Bless tidy issues order) - rust-lang#122179 (rustc: Fix typo) - rust-lang#122181 (Fix crash in internal late lint checking) - rust-lang#122183 (interpret: update comment about read_discriminant on uninhabited variants) Failed merges: - rust-lang#122076 (Tweak the way we protect in-place function arguments in interpreters) - rust-lang#122132 (Diagnostic renaming 3) r? `@ghost` `@rustbot` modify labels: rollup

It's the only diagnostic in the entire project that impls `Default`, and the code is clearer without it.

Also rename `into_diagnostic_arg` as `into_diag_arg`, and `NotIntoDiagnosticArg` as `NotInotDiagArg`.

To match `derive(Diagnostic)`. Also rename `into_diagnostic` as `into_diag`.

To match `derive(Subdiagnostic)`. Also rename `add_to_diagnostic{,_with}` as `add_to_diag{,_with}`.

To match `derive(LintDiagnostic)`.

For increased consistency. - session_diagnostic_derive -> diagnostic_derive - session_subdiagnostic_derive -> subdiagnostic_derive - SubdiagnosticDeriveBuilder -> SubdiagnosticDerive

nnethercote · 2024-03-10T23:23:10Z

I rebased.

@bors r+ p=1

Because this is conflict-prone.

bors · 2024-03-10T23:23:13Z

📌 Commit 43c0633 has been approved by nnethercote

It is now in the queue for this repository.

bors · 2024-03-11T00:34:49Z

⌛ Testing commit 43c0633 with merge cd81f5b...

bors · 2024-03-11T02:45:41Z

☀️ Test successful - checks-actions
Approved by: nnethercote
Pushing cd81f5b to master...

rust-timer · 2024-03-11T04:37:45Z

Finished benchmarking commit (cd81f5b): 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)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.6%	[-2.8%, -2.2%]	3
Improvements ✅ (secondary)	-2.3%	[-3.2%, -1.5%]	10
All ❌✅ (primary)	-2.6%	[-2.8%, -2.2%]	3

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: 646.276s -> 648.469s (0.34%)
Artifact size: 309.98 MiB -> 309.94 MiB (-0.01%)

A sequel to rust-lang#1883, this covers diagnostic naming changes from rust-lang/rust/pull/121489, rust-lang/rust/pull/121780, and rust-lang/rust/pull/122132.

A sequel to #1883, this covers diagnostic naming changes from rust-lang/rust/pull/121489, rust-lang/rust/pull/121780, and rust-lang/rust/pull/122132.

…rcote Diagnostic renaming 3 A sequel to rust-lang#121780. r? `@davidtwco`

rustbot assigned davidtwco Mar 7, 2024

davidtwco approved these changes Mar 7, 2024

View reviewed changes

compiler/rustc_ast_lowering/src/errors.rs Outdated Show resolved Hide resolved

nnethercote force-pushed the diag-renaming3 branch from 7222172 to b91031a Compare March 8, 2024 02:19

davidtwco approved these changes Mar 8, 2024

View reviewed changes

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 Mar 8, 2024

matthiaskrgr mentioned this pull request Mar 8, 2024

Rollup of 8 pull requests #122190

Merged

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 8, 2024

nnethercote added 8 commits March 11, 2024 08:52

Remove Default derive from MacroExpectedFound.

567744c

It's the only diagnostic in the entire project that impls `Default`, and the code is clearer without it.

Remove unused impls for some diagnostics.

4e38ef9

Remove unused impls from some subdiagnostics.

256d802

Rename IntoDiagnosticArg as IntoDiagArg.

a09b1d3

Also rename `into_diagnostic_arg` as `into_diag_arg`, and `NotIntoDiagnosticArg` as `NotInotDiagArg`.

Rename IntoDiagnostic as Diagnostic.

7a294e9

To match `derive(Diagnostic)`. Also rename `into_diagnostic` as `into_diag`.

Rename AddToDiagnostic as Subdiagnostic.

541d7cc

To match `derive(Subdiagnostic)`. Also rename `add_to_diagnostic{,_with}` as `add_to_diag{,_with}`.

Rename DecorateLint as LintDiagnostic.

e9f0d9b

To match `derive(LintDiagnostic)`.

Rename diagnostic derive things.

43c0633

For increased consistency. - session_diagnostic_derive -> diagnostic_derive - session_subdiagnostic_derive -> subdiagnostic_derive - SubdiagnosticDeriveBuilder -> SubdiagnosticDerive

nnethercote force-pushed the diag-renaming3 branch from b91031a to 43c0633 Compare March 10, 2024 23:22

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 10, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 11, 2024

bors merged commit cd81f5b into rust-lang:master Mar 11, 2024
12 checks passed

rustbot added this to the 1.78.0 milestone Mar 11, 2024

nnethercote deleted the diag-renaming3 branch March 11, 2024 05:20

nnethercote mentioned this pull request Mar 11, 2024

More updates for recent diagnostics changes. rust-lang/rustc-dev-guide#1936

Merged

GuillaumeGomez pushed a commit to GuillaumeGomez/rust that referenced this pull request Jul 10, 2024

Auto merge of rust-lang#122132 - nnethercote:diag-renaming3, r=nnethe…

0031b21

…rcote Diagnostic renaming 3 A sequel to rust-lang#121780. r? `@davidtwco`

matthiaskrgr mentioned this pull request Sep 15, 2024

ICE: asked to assemble auto trait candidates of unexpected type: FreshTy(0) #130411

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Diagnostic renaming 3 #122132

Diagnostic renaming 3 #122132

nnethercote commented Mar 7, 2024

rustbot commented Mar 7, 2024

davidtwco left a comment

nnethercote commented Mar 8, 2024 •

edited

Loading

davidtwco commented Mar 8, 2024

bors commented Mar 8, 2024

bors commented Mar 8, 2024

nnethercote commented Mar 10, 2024

bors commented Mar 10, 2024

bors commented Mar 11, 2024

bors commented Mar 11, 2024

rust-timer commented Mar 11, 2024

Diagnostic renaming 3 #122132

Diagnostic renaming 3 #122132

Conversation

nnethercote commented Mar 7, 2024

rustbot commented Mar 7, 2024

davidtwco left a comment

Choose a reason for hiding this comment

nnethercote commented Mar 8, 2024 • edited Loading

davidtwco commented Mar 8, 2024

bors commented Mar 8, 2024

bors commented Mar 8, 2024

nnethercote commented Mar 10, 2024

bors commented Mar 10, 2024

bors commented Mar 11, 2024

bors commented Mar 11, 2024

rust-timer commented Mar 11, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

nnethercote commented Mar 8, 2024 •

edited

Loading