Skip to content

Rename errors.rs file to diagnostics.rs (11/N)#157974

Merged
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
GuillaumeGomez:rename-err-to-diag
Jun 16, 2026
Merged

Rename errors.rs file to diagnostics.rs (11/N)#157974
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
GuillaumeGomez:rename-err-to-diag

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Follow-up of #157485.

This one is a bit different than the previous ones: it had both diagnostics.rs and errors.rs files, but both were switched compared to what the other compiler crates do (for diagnostics.rs in particular). So first we switched the two files, and then, to avoid confusion between errors.rs and diagnostics.rs, I renamed errors.rs into error_helper.rs.

r? @JonathanBrouwer

@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 16, 2026

@JonathanBrouwer JonathanBrouwer left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Github was very unhelpful with reviewing here, but managed to review the diff by making some manual diffs, looks good
@bors r+ rollup

View changes since this review

@rust-bors

rust-bors Bot commented Jun 16, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 4f6a600 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 16, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jun 16, 2026
… r=JonathanBrouwer

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

Follow-up of rust-lang#157485.

This one is a bit different than the previous ones: it had both `diagnostics.rs` and `errors.rs` files, but both were switched compared to what the other compiler crates do (for `diagnostics.rs` in particular). So first we switched the two files, and then, to avoid confusion between `errors.rs` and `diagnostics.rs`, I renamed `errors.rs` into `error_helper.rs`.

r? @JonathanBrouwer
rust-bors Bot pushed a commit that referenced this pull request Jun 16, 2026
…uwer

Rollup of 13 pull requests

Successful merges:

 - #156538 (Refactor `AliasTy`. `AliasTerm` & `UnevaluatedConst` to use `Alias`)
 - #156807 (Add `T: PartialEq` bounds to derived `StructuralPartialEq` impls.)
 - #156950 (Staticlib rename internal symbols)
 - #156983 (Add `io::Read::read_le` and `io::Read::read_be`)
 - #157306 (tests: codegen-llvm: Expect the new mangling scheme in bpf-abi-indirect-return)
 - #157702 (Add expansion info to implied bounds)
 - #155616 (constify `TryFrom<Vec>` for array)
 - #156226 (diagnostics: point to coroutine body on higher-ranked auto trait errors)
 - #157870 (std: sys: solid: clamp connect_timeout tv_sec instead of truncating)
 - #157952 (Configure Renovate for GitHub Actions)
 - #157953 (fix(rustc_codegen_ssa): Use cg_operand for Freeze check)
 - #157958 (doc: Document `-Zlint-rust-version`)
 - #157974 (Rename `errors.rs` file to `diagnostics.rs` (11/N))
@rust-bors rust-bors Bot merged commit 8c537db into rust-lang:main Jun 16, 2026
13 checks passed
@rustbot rustbot added this to the 1.98.0 milestone Jun 16, 2026
@GuillaumeGomez GuillaumeGomez deleted the rename-err-to-diag branch June 17, 2026 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

3 participants