Skip to content

Rename errors.rs file to diagnostics.rs (2/N)#157535

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

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

Conversation

@GuillaumeGomez

@GuillaumeGomez GuillaumeGomez commented Jun 6, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

Follow-up of #157485.

r? @JonathanBrouwer

@rustbot

rustbot commented Jun 6, 2026

Copy link
Copy Markdown
Collaborator

Some changes occurred in rustc_ty_utils::consts.rs

cc @BoxyUwU

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann, @JonathanBrouwer

Some changes occurred to diagnostic attributes.

cc @mejrs

Some changes occurred in check-cfg diagnostics

cc @Urgau

@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) 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 6, 2026
@JonathanBrouwer JonathanBrouwer changed the title Rename errors.rs file to diagnostics.rs Rename errors.rs file to diagnostics.rs (2/N) Jun 6, 2026
JonathanBrouwer
JonathanBrouwer requested changes Jun 6, 2026
View reviewed changes
Comment thread compiler/rustc_attr_parsing/src/diagnostics.rs

@JonathanBrouwer JonathanBrouwer Jun 6, 2026 •
edited by rustbot
Loading

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.

rustc_attr_parsing has both errors.rs and session_diagnostics.rs. I think it makes sense to merge those together into a single diagnostics.rs?

View changes since the review

@mejrs mejrs Jun 6, 2026

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.

rustc_attr_parsing/attributes/diagnostic/mod.rs also has some diagnostic structs in it, if we're merging files we might as well move those too.

@GuillaumeGomez GuillaumeGomez Jun 6, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Time to merge some files then!

@mejrs mejrs Jun 6, 2026

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.

To clarify; I meant "move the diagnostic structs in rustc_attr_parsing/attributes/diagnostic/mod.rs to diagnostics.rs". Not the attribute parsers.

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 6, 2026
@GuillaumeGomez

GuillaumeGomez commented Jun 6, 2026

Copy link
Copy Markdown
Member Author

Moved all diagnostics into diagnostics.rs as suggested.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez GuillaumeGomez force-pushed the rename-err-to-diag-2 branch from 139c97a to feac3e0 Compare June 6, 2026 22:33
@rustbot rustbot added the A-meta Area: Issues & PRs about the rust-lang/rust repository itself label Jun 6, 2026
mejrs
mejrs requested changes Jun 6, 2026
View reviewed changes
Comment thread compiler/rustc_attr_parsing/src/attributes/diagnostic/on_unmatch_args.rs
@@ -1,56 +0,0 @@
use rustc_feature::AttributeStability;

@mejrs mejrs Jun 6, 2026 •
edited by rustbot
Loading

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.

Please undo these deletions. same for all the other files in this directory.

View changes since the review

@GuillaumeGomez GuillaumeGomez Jun 7, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

No problem. 👍

@GuillaumeGomez GuillaumeGomez force-pushed the rename-err-to-diag-2 branch from feac3e0 to 8be243d Compare June 7, 2026 19:51
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez GuillaumeGomez force-pushed the rename-err-to-diag-2 branch from 8be243d to d16c5fa Compare June 7, 2026 20:00
@rust-log-analyzer

rust-log-analyzer commented Jun 7, 2026

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@GuillaumeGomez

GuillaumeGomez commented Jun 7, 2026

Copy link
Copy Markdown
Member Author

Ah a flaky. Restarting CI.

@GuillaumeGomez

GuillaumeGomez commented Jun 7, 2026

Copy link
Copy Markdown
Member Author

CI is happy now.

JonathanBrouwer
JonathanBrouwer approved these changes Jun 8, 2026
View reviewed changes

@JonathanBrouwer JonathanBrouwer left a comment •
edited by rustbot
Loading

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.

Looks good now, ty
@bors r+ rollup

View changes since this review

@rust-bors

rust-bors Bot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

📌 Commit d16c5fa has been approved by JonathanBrouwer

It is now in the queue for this repository.

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 8, 2026
@JonathanBrouwer JonathanBrouwer mentioned this pull request Jun 8, 2026
Merged
rust-bors Bot pushed a commit that referenced this pull request Jun 8, 2026
@bors
Auto merge of #157600 - JonathanBrouwer:rollup-iLVNIqp, r=JonathanBro…
877a131 
…uwer

Rollup of 9 pull requests

Successful merges:

 - #157599 (`rust-analyzer` subtree update)
 - #157298 (Use alternate means of detecting enums in `is_udt`)
 - #155338 (Staticlib hide internal symbols)
 - #157402 (Implement feature `integer_casts`)
 - #157452 (Fix WASI links)
 - #157535 (Rename `errors.rs` file to `diagnostics.rs` (2/N))
 - #157585 (Rename `errors.rs` file to `diagnostics.rs` (3/N))
 - #157588 (Use `mul nuw nsw` in `intrinsics::copy`)
 - #157592 (Suggest comma multiple)
@rust-bors rust-bors Bot merged commit 91d945f into rust-lang:main Jun 8, 2026
16 of 36 checks passed
@rustbot rustbot added this to the 1.98.0 milestone Jun 8, 2026
rust-timer added a commit that referenced this pull request Jun 8, 2026
@rust-timer
Unrolled build for #157535
9813d4d 
Rollup merge of #157535 - GuillaumeGomez:rename-err-to-diag-2, r=JonathanBrouwer

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

Follow-up of #157485.

r? @JonathanBrouwer
@GuillaumeGomez GuillaumeGomez deleted the rename-err-to-diag-2 branch June 8, 2026 13:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mejrs mejrs mejrs requested changes

@JonathanBrouwer JonathanBrouwer JonathanBrouwer approved these changes

Assignees

@JonathanBrouwer JonathanBrouwer

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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

1.98.0

Development

Successfully merging this pull request may close these issues.

5 participants

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