Skip to content

Rename errors.rs file to diagnostics.rs (1/N)#157485

Open
GuillaumeGomez wants to merge 3 commits into
rust-lang:mainfrom
GuillaumeGomez:rename-err-to-diag
Open

Rename errors.rs file to diagnostics.rs (1/N)#157485
GuillaumeGomez wants to merge 3 commits into
rust-lang:mainfrom
GuillaumeGomez:rename-err-to-diag

Conversation

@GuillaumeGomez
Copy link
Copy Markdown
Member

@GuillaumeGomez GuillaumeGomez commented Jun 5, 2026

errors.rs (and sometimes error.rs, depends on the crate) are not coherent with their content which can be both errors and lints. However, they're both diagnostics so it would make more sense to rename all of them into diagnostics.rs.

I only did 3 crates for a start to confirm it's ok to go forward with this.

I think it was discussed with @JonathanBrouwer so setting them as reviewer. :3

r? @JonathanBrouwer

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Jun 5, 2026

Some changes occurred in compiler/rustc_builtin_macros/src/autodiff.rs

cc @ZuseZ4

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 5, 2026
JonathanBrouwer
JonathanBrouwer approved these changes Jun 5, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@JonathanBrouwer JonathanBrouwer left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me!
Please keep doing PRs with groups of a few crates like this, so the PRs are not too likely to immediately conflict with everything

View changes since this review

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

JonathanBrouwer commented Jun 5, 2026

@bors r+ rollup

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Jun 5, 2026

📌 Commit 6325774 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Jun 5, 2026
@GuillaumeGomez
Copy link
Copy Markdown
Member Author

GuillaumeGomez commented Jun 5, 2026

Noted, gonna make another one once this one is merged and so on.

@JonathanBrouwer JonathanBrouwer mentioned this pull request Jun 5, 2026
Closed
rust-bors Bot pushed a commit that referenced this pull request Jun 5, 2026
@bors
Auto merge of #157492 - JonathanBrouwer:rollup-dC3NNN3, r=JonathanBro…
b6db00e 
…uwer

Rollup of 12 pull requests

Successful merges:

 - #157467 (stdarch subtree update)
 - #155453 (apply Cortex-A53 errata 843419 mitigation to the AArch64 Linux targets)
 - #156798 (delegation: do not always generate first argument)
 - #157016 (add `extern "tail"` calling convention)
 - #157450 (mark `Encode`, `Decode`, `Mark` impls as `#[inline]`)
 - #148183 (rustdoc: Test & document `test_harness` code block attribute)
 - #157190 (Silence recursive RUSTC_LOG_FORMAT_JSON messages)
 - #157470 (Avoid ICE when emitting TargetMachine config errors)
 - #157474 (Forbid optimize(none) with inline(always) or inline.)
 - #157475 (Add a smoke test for the optimize attribute.)
 - #157479 (Warn when `#[macro_use]` or `#[macro_escape]` is used on the crate root)
 - #157486 (Remove unused attributes from issue-29485.rs.)

Failed merges:

 - #157485 (Rename `errors.rs` file to `diagnostics.rs`)
@jhpratt jhpratt mentioned this pull request Jun 5, 2026
Closed
rust-bors Bot pushed a commit that referenced this pull request Jun 5, 2026
@bors
Auto merge of #157502 - jhpratt:rollup-z2lySF3, r=jhpratt
d7f760c 
Rollup of 12 pull requests

Successful merges:

 - #155453 (apply Cortex-A53 errata 843419 mitigation to the AArch64 Linux targets)
 - #156798 (delegation: do not always generate first argument)
 - #157438 (rustdoc: don't link doc(hidden) associated type projections)
 - #157450 (mark `Encode`, `Decode`, `Mark` impls as `#[inline]`)
 - #148183 (rustdoc: Test & document `test_harness` code block attribute)
 - #157190 (Silence recursive RUSTC_LOG_FORMAT_JSON messages)
 - #157396 (Add @aapoalas to libs review rotation)
 - #157470 (Avoid ICE when emitting TargetMachine config errors)
 - #157474 (Forbid optimize(none) with inline(always) or inline.)
 - #157475 (Add a smoke test for the optimize attribute.)
 - #157479 (Warn when `#[macro_use]` or `#[macro_escape]` is used on the crate root)
 - #157486 (Remove unused attributes from issue-29485.rs.)

Failed merges:

 - #157485 (Rename `errors.rs` file to `diagnostics.rs`)
@jhpratt jhpratt mentioned this pull request Jun 5, 2026
Merged
rust-bors Bot pushed a commit that referenced this pull request Jun 5, 2026
@bors
Auto merge of #157504 - jhpratt:rollup-cOVIb3M, r=jhpratt
8954863 
Rollup of 12 pull requests

Successful merges:

 - #157467 (stdarch subtree update)
 - #155453 (apply Cortex-A53 errata 843419 mitigation to the AArch64 Linux targets)
 - #156798 (delegation: do not always generate first argument)
 - #157438 (rustdoc: don't link doc(hidden) associated type projections)
 - #157450 (mark `Encode`, `Decode`, `Mark` impls as `#[inline]`)
 - #157190 (Silence recursive RUSTC_LOG_FORMAT_JSON messages)
 - #157396 (Add @aapoalas to libs review rotation)
 - #157470 (Avoid ICE when emitting TargetMachine config errors)
 - #157474 (Forbid optimize(none) with inline(always) or inline.)
 - #157475 (Add a smoke test for the optimize attribute.)
 - #157479 (Warn when `#[macro_use]` or `#[macro_escape]` is used on the crate root)
 - #157486 (Remove unused attributes from issue-29485.rs.)

Failed merges:

 - #157485 (Rename `errors.rs` file to `diagnostics.rs`)
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jun 5, 2026
Closed
@rust-bors rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 5, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-bors rust-bors Bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 5, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Jun 6, 2026

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@GuillaumeGomez
Copy link
Copy Markdown
Member Author

GuillaumeGomez commented Jun 6, 2026

@bors r=JonathanBrouwer rollup

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Jun 6, 2026

📌 Commit 100b35f has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Jun 6, 2026
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jun 6, 2026
Open
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jun 6, 2026
@JonathanBrouwer
Rollup merge of rust-lang#157485 - GuillaumeGomez:rename-err-to-diag,…
cfb9da6 
… r=JonathanBrouwer

Rename `errors.rs` file to `diagnostics.rs`

`errors.rs` (and sometimes `error.rs`, depends on the crate) are not coherent with their content which can be both errors and lints. However, they're both diagnostics so it would make more sense to rename all of them into `diagnostics.rs`.

I only did 3 crates for a start to confirm it's ok to go forward with this.

I think it was discussed with @JonathanBrouwer so setting them as reviewer. :3

r? @JonathanBrouwer
@JonathanBrouwer JonathanBrouwer mentioned this pull request Jun 6, 2026
Closed
@JonathanBrouwer JonathanBrouwer changed the title Rename errors.rs file to diagnostics.rs Rename errors.rs file to diagnostics.rs (1/N) Jun 6, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jun 6, 2026
@JonathanBrouwer
Rollup merge of rust-lang#157485 - GuillaumeGomez:rename-err-to-diag,…
7242198 
… r=JonathanBrouwer

Rename `errors.rs` file to `diagnostics.rs` (1/N)

`errors.rs` (and sometimes `error.rs`, depends on the crate) are not coherent with their content which can be both errors and lints. However, they're both diagnostics so it would make more sense to rename all of them into `diagnostics.rs`.

I only did 3 crates for a start to confirm it's ok to go forward with this.

I think it was discussed with @JonathanBrouwer so setting them as reviewer. :3

r? @JonathanBrouwer
@JonathanBrouwer JonathanBrouwer mentioned this pull request Jun 6, 2026
Open
rust-bors Bot pushed a commit that referenced this pull request Jun 6, 2026
@bors
Auto merge of #157541 - JonathanBrouwer:rollup-Kf94s03, r=JonathanBro…
179ed75 
…uwer

Rollup of 17 pull requests

Successful merges:

 - #157251 (`rust-analyzer` subtree update)
 - #157533 (Subtree sync for rustc_codegen_cranelift)
 - #154742 (Add APIs for case folding to the standard library)
 - #155144 (mir_build: Add an extra intermediate step in MIR building for patterns )
 - #157016 (add `extern "tail"` calling convention)
 - #157264 (diagnostics: Fix ICE building a trait ref in method suggestions)
 - #157386 (Parse deprecated note links separately in rustc_resolve)
 - #157483 (fix windows-gnu TLS leak)
 - #157488 (compiletest: inject `#![windows_subsystem = "windows"]` to debuginfo tests on Windows)
 - #157509 (remove solaris implementation for File::lock, it has the wrong semantics)
 - #157521 (Rename `SyncView::{as_pin => as_pin_ref}`)
 - #156136 (Move tests box)
 - #157365 (Revert "LLVM 23: Run AssignGUIDPass in some places")
 - #157471 (Debug assert that parsed attributes are in the `BUILTIN_ATTRIBUTE_MAP`)
 - #157485 (Rename `errors.rs` file to `diagnostics.rs` (1/N))
 - #157494 (Convert `QueryRegionConstraint` into a struct)
 - #157526 (std tests: skip a slow test on Miri)

Failed merges:

 - #155527 (Replace printables table with `unicode_data.rs` tables)
rust-bors Bot pushed a commit that referenced this pull request Jun 6, 2026
@bors
Auto merge of #157541 - JonathanBrouwer:rollup-Kf94s03, r=JonathanBro…
20f0a86 
…uwer

Rollup of 17 pull requests

Successful merges:

 - #157251 (`rust-analyzer` subtree update)
 - #157533 (Subtree sync for rustc_codegen_cranelift)
 - #154742 (Add APIs for case folding to the standard library)
 - #155144 (mir_build: Add an extra intermediate step in MIR building for patterns )
 - #157016 (add `extern "tail"` calling convention)
 - #157264 (diagnostics: Fix ICE building a trait ref in method suggestions)
 - #157386 (Parse deprecated note links separately in rustc_resolve)
 - #157483 (fix windows-gnu TLS leak)
 - #157488 (compiletest: inject `#![windows_subsystem = "windows"]` to debuginfo tests on Windows)
 - #157509 (remove solaris implementation for File::lock, it has the wrong semantics)
 - #157521 (Rename `SyncView::{as_pin => as_pin_ref}`)
 - #156136 (Move tests box)
 - #157365 (Revert "LLVM 23: Run AssignGUIDPass in some places")
 - #157471 (Debug assert that parsed attributes are in the `BUILTIN_ATTRIBUTE_MAP`)
 - #157485 (Rename `errors.rs` file to `diagnostics.rs` (1/N))
 - #157494 (Convert `QueryRegionConstraint` into a struct)
 - #157526 (std tests: skip a slow test on Miri)

Failed merges:

 - #155527 (Replace printables table with `unicode_data.rs` tables)
rust-bors Bot pushed a commit that referenced this pull request Jun 6, 2026
@bors
Auto merge of #157541 - JonathanBrouwer:rollup-Kf94s03, r=JonathanBro…
5e9b677 
…uwer

Rollup of 17 pull requests

Successful merges:

 - #157251 (`rust-analyzer` subtree update)
 - #157533 (Subtree sync for rustc_codegen_cranelift)
 - #154742 (Add APIs for case folding to the standard library)
 - #155144 (mir_build: Add an extra intermediate step in MIR building for patterns )
 - #157016 (add `extern "tail"` calling convention)
 - #157264 (diagnostics: Fix ICE building a trait ref in method suggestions)
 - #157386 (Parse deprecated note links separately in rustc_resolve)
 - #157483 (fix windows-gnu TLS leak)
 - #157488 (compiletest: inject `#![windows_subsystem = "windows"]` to debuginfo tests on Windows)
 - #157509 (remove solaris implementation for File::lock, it has the wrong semantics)
 - #157521 (Rename `SyncView::{as_pin => as_pin_ref}`)
 - #156136 (Move tests box)
 - #157365 (Revert "LLVM 23: Run AssignGUIDPass in some places")
 - #157471 (Debug assert that parsed attributes are in the `BUILTIN_ATTRIBUTE_MAP`)
 - #157485 (Rename `errors.rs` file to `diagnostics.rs` (1/N))
 - #157494 (Convert `QueryRegionConstraint` into a struct)
 - #157526 (std tests: skip a slow test on Miri)

Failed merges:

 - #155527 (Replace printables table with `unicode_data.rs` tables)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JonathanBrouwer JonathanBrouwer JonathanBrouwer approved these changes

Assignees

@JonathanBrouwer JonathanBrouwer

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@GuillaumeGomez @rustbot @JonathanBrouwer