Skip to content

Rename errors.rs file to diagnostics.rs (6/N) - #157752

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

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

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Follow-up of #157485.

r? @JonathanBrouwer

@rustbot

Copy link
Copy Markdown
Collaborator

HIR ty lowering was modified

cc @fmease

@rustbotrustbot 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 11, 2026
@JonathanBrouwerJonathanBrouwer changed the title Rename errors.rs file to diagnostics.rs (5/N)Rename errors.rs file to diagnostics.rs (6/N)Jun 11, 2026

@JonathanBrouwerJonathanBrouwer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@rust-bors

rust-borsBot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

📌 Commit f1c371f has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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-review Status: Awaiting review from the assignee but also interested parties. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 11, 2026
@rust-bors

This comment has been minimized.

@rustbot

This comment has been minimized.

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r=JonathanBrouwer rollup

@rust-bors

rust-borsBot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 14bce1a has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 12, 2026
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 12, 2026
…3, r=JonathanBrouwer
Rename `errors.rs` file to `diagnostics.rs` (6/N)
Follow-up of rust-lang#157485.
r? @JonathanBrouwer
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jun 12, 2026
…3, r=JonathanBrouwer
Rename `errors.rs` file to `diagnostics.rs` (6/N)
Follow-up of rust-lang#157485.
r? @JonathanBrouwer
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jun 12, 2026
…3, r=JonathanBrouwer
Rename `errors.rs` file to `diagnostics.rs` (6/N)
Follow-up of rust-lang#157485.
r? @JonathanBrouwer
rust-borsBot pushed a commit that referenced this pull request Jun 12, 2026
…uwer
Rollup of 17 pull requests
Successful merges:
- #156950 (Staticlib rename internal symbols)
- #157322 (test pre-stabilization items on CI)
- #157490 (Add field-wise CoerceShared reborrow tests)
- #157655 (Make Share::share final and improve docs)
- #157688 (Create experimental test job `aarch64-apple-macos-26` for evaluating `macos-26` runner images)
- #157796 (rustdoc: Some more lazy formatting)
- #157069 (Test that you can't implement Unpin for a compiler-generated future using TAIT)
- #157202 (add #[rustc_no_writable] to slice::get_unchecked_mut)
- #157622 (Disable retagging for variadic arguments in const-eval)
- #157684 (-Zassumptions-on-binders: insert empty assumptions when entering binders in the solver)
- #157695 (Extend capabilities of `TypeFoldable_Generic`)
- #157752 (Rename `errors.rs` file to `diagnostics.rs` (6/N))
- #157766 (interpret: avoid computing layout of sized raw pointee)
- #157785 (fuchsia: Support AddressSanitizer on riscv64gc-unknown-fuchsia)
- #157795 (revert 157013)
- #157798 (Prevent approving PRs that wait for Crater or formal decisions)
- #157803 (Rename `errors.rs` file to `diagnostics.rs` (7/N))
rust-borsBot pushed a commit that referenced this pull request Jun 12, 2026
…uwer
Rollup of 17 pull requests
Successful merges:
- #156950 (Staticlib rename internal symbols)
- #157322 (test pre-stabilization items on CI)
- #157490 (Add field-wise CoerceShared reborrow tests)
- #157655 (Make Share::share final and improve docs)
- #157688 (Create experimental test job `aarch64-apple-macos-26` for evaluating `macos-26` runner images)
- #157796 (rustdoc: Some more lazy formatting)
- #157069 (Test that you can't implement Unpin for a compiler-generated future using TAIT)
- #157202 (add #[rustc_no_writable] to slice::get_unchecked_mut)
- #157622 (Disable retagging for variadic arguments in const-eval)
- #157684 (-Zassumptions-on-binders: insert empty assumptions when entering binders in the solver)
- #157695 (Extend capabilities of `TypeFoldable_Generic`)
- #157752 (Rename `errors.rs` file to `diagnostics.rs` (6/N))
- #157766 (interpret: avoid computing layout of sized raw pointee)
- #157785 (fuchsia: Support AddressSanitizer on riscv64gc-unknown-fuchsia)
- #157795 (revert 157013)
- #157798 (Prevent approving PRs that wait for Crater or formal decisions)
- #157803 (Rename `errors.rs` file to `diagnostics.rs` (7/N))
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jun 12, 2026
…3, r=JonathanBrouwer
Rename `errors.rs` file to `diagnostics.rs` (6/N)
Follow-up of rust-lang#157485.
r? @JonathanBrouwer
This was referenced Jun 12, 2026
rust-borsBot pushed a commit that referenced this pull request Jun 12, 2026
…uwer
Rollup of 23 pull requests
Successful merges:
- #144220 (Add powerpc64-unknown-linux-gnuelfv2 target)
- #153238 (debuginfo: slices are DW_TAG_array_type's)
- #157112 (Update aarch64-unknown-freebsd target description)
- #157322 (test pre-stabilization items on CI)
- #157348 (Don't track cwd for `-Zremap-cwd-prefix` in incremental compilation)
- #157490 (Add field-wise CoerceShared reborrow tests)
- #157655 (Make Share::share final and improve docs)
- #157672 (Region inference: Simplify initialisation of region values)
- #157680 (Require `#[pin_v2]` for explicit pin-projection patterns)
- #157688 (Create experimental test job `aarch64-apple-macos-26` for evaluating `macos-26` runner images)
- #157796 (rustdoc: Some more lazy formatting)
- #157818 (miri subtree update)
- #157069 (Test that you can't implement Unpin for a compiler-generated future using TAIT)
- #157079 (Don't recover `&raw EXPR` as a missing comma)
- #157202 (add #[rustc_no_writable] to slice::get_unchecked_mut)
- #157622 (Disable retagging for variadic arguments in const-eval)
- #157684 (-Zassumptions-on-binders: insert empty assumptions when entering binders in the solver)
- #157695 (Extend capabilities of `TypeFoldable_Generic`)
- #157766 (interpret: avoid computing layout of sized raw pointee)
- #157785 (fuchsia: Support AddressSanitizer on riscv64gc-unknown-fuchsia)
- #157795 (revert 157013)
- #157798 (Prevent approving PRs that wait for Crater or formal decisions)
- #157803 (Rename `errors.rs` file to `diagnostics.rs` (7/N))
Failed merges:
- #157752 (Rename `errors.rs` file to `diagnostics.rs` (6/N))
@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 12, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 12, 2026
pullBot pushed a commit to xtqqczze/rust-lang-miri that referenced this pull request Jun 13, 2026
…uwer
Rollup of 23 pull requests
Successful merges:
- rust-lang/rust#144220 (Add powerpc64-unknown-linux-gnuelfv2 target)
- rust-lang/rust#153238 (debuginfo: slices are DW_TAG_array_type's)
- rust-lang/rust#157112 (Update aarch64-unknown-freebsd target description)
- rust-lang/rust#157322 (test pre-stabilization items on CI)
- rust-lang/rust#157348 (Don't track cwd for `-Zremap-cwd-prefix` in incremental compilation)
- rust-lang/rust#157490 (Add field-wise CoerceShared reborrow tests)
- rust-lang/rust#157655 (Make Share::share final and improve docs)
- rust-lang/rust#157672 (Region inference: Simplify initialisation of region values)
- rust-lang/rust#157680 (Require `#[pin_v2]` for explicit pin-projection patterns)
- rust-lang/rust#157688 (Create experimental test job `aarch64-apple-macos-26` for evaluating `macos-26` runner images)
- rust-lang/rust#157796 (rustdoc: Some more lazy formatting)
- rust-lang/rust#157818 (miri subtree update)
- rust-lang/rust#157069 (Test that you can't implement Unpin for a compiler-generated future using TAIT)
- rust-lang/rust#157079 (Don't recover `&raw EXPR` as a missing comma)
- rust-lang/rust#157202 (add #[rustc_no_writable] to slice::get_unchecked_mut)
- rust-lang/rust#157622 (Disable retagging for variadic arguments in const-eval)
- rust-lang/rust#157684 (-Zassumptions-on-binders: insert empty assumptions when entering binders in the solver)
- rust-lang/rust#157695 (Extend capabilities of `TypeFoldable_Generic`)
- rust-lang/rust#157766 (interpret: avoid computing layout of sized raw pointee)
- rust-lang/rust#157785 (fuchsia: Support AddressSanitizer on riscv64gc-unknown-fuchsia)
- rust-lang/rust#157795 (revert 157013)
- rust-lang/rust#157798 (Prevent approving PRs that wait for Crater or formal decisions)
- rust-lang/rust#157803 (Rename `errors.rs` file to `diagnostics.rs` (7/N))
Failed merges:
- rust-lang/rust#157752 (Rename `errors.rs` file to `diagnostics.rs` (6/N))
@rustbot

Copy link
Copy Markdown
Collaborator

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.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r=JonathanBrouwer rollup

@rust-bors

rust-borsBot commented Jun 13, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 190a22d has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 13, 2026
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)
...............................F.................. (50/144)
.................................................. (100/144)
............................................ (144/144)
======== tests/rustdoc-gui/go-to-collapsed-elem.goml ========
[ERROR] line 40
at `tests/rustdoc-gui/go-to-collapsed-elem.goml` line 21: Error: Node is detached from document: for command `click: "//*[@id='search']//a[@href='../test_docs/struct.Foo.html#method.must_use']"`
at <file:///checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-gui/doc/test_docs/struct.Foo.html?search=t_use>
<= doc-ui tests done: 143 succeeded, 1 failed, 0 filtered out
Error: ()

rust-borsBot pushed a commit that referenced this pull request Jun 13, 2026
…uwer
Rollup of 5 pull requests
Successful merges:
- #157518 (Add xdg_basedir API)
- #157752 (Rename `errors.rs` file to `diagnostics.rs` (6/N))
- #157769 (Match expressions had not been updated to also show the match_source,…)
- #157825 (Emit retags in codegen to support BorrowSanitizer (part 3))
- #157861 (Rename `errors.rs` file to `diagnostics.rs` (7/N))
@rust-bors
rust-borsBot merged commit 04724ff into rust-lang:mainJun 13, 2026
9 of 13 checks passed
@rustbotrustbot added this to the 1.98.0 milestone Jun 13, 2026
rust-timer added a commit that referenced this pull request Jun 13, 2026
Rollup merge of #157752 - GuillaumeGomez:rename-err-to-diag-3, r=JonathanBrouwer
Rename `errors.rs` file to `diagnostics.rs` (6/N)
Follow-up of #157485.
r? @JonathanBrouwer
@GuillaumeGomez
GuillaumeGomez deleted the rename-err-to-diag-3 branch June 13, 2026 18:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

4 participants

@GuillaumeGomez@rustbot@rust-log-analyzer@JonathanBrouwer