Skip to content

Merge rustc_lint/lints.rs into diagnostics.rs - #160755

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
JonathanBrouwer:rustc_lint_diags
Aug 9, 2026
Merged

Merge rustc_lint/lints.rs into diagnostics.rs#160755
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
JonathanBrouwer:rustc_lint_diags

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Contributor

Renaming diagnostics files to all be diagnostics.rs, per the decision in rust-lang/compiler-team#1003

r? @GuillaumeGomez

  • I did not use an LLM to create a change in this PR.
  • I used an LLM to create a change in this PR, and I have explained below how it was used.

@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 Aug 8, 2026
@@ -108,7 +126,7 @@ pub(crate) struct BuiltinEllipsisInclusiveRangePatterns {
#[derive(Subdiagnostic)]
#[note("requested on the command line with `{$level} {$lint_name}`")]
pub(crate) struct RequestedLevel<'a> {
pub level: Level,
pub level: rustc_session::lint::Level,

@JonathanBrouwer JonathanBrouwer Aug 8, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This was needed as there is now another type called Level in scope which was used in more places

View changes since the review

@GuillaumeGomez

Copy link
Copy Markdown
Member

Thanks!

@bors r+ rollup

@rust-bors

rust-bors Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 92c6357 has been approved by GuillaumeGomez

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 Aug 8, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 8, 2026
…uwer

Rollup of 9 pull requests

Successful merges:

 - #156935 (Introduce a `PinSafePointer` trait that generalizes `PinCoerceUnsized`)
 - #159834 (Apply str debugger visualizer to `*const str`, `*mut str` and `Box<str>`)
 - #160663 (Suggest add async for function sig with return expr in body)
 - #160732 (Optimize slice::contains for one-byte BytewiseEq types)
 - #157944 (Make `char::is_default_ignorable` unstably public)
 - #158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
 - #160754 (Rename more diagnostic files to `diagnostics.rs`)
 - #160755 (Merge `rustc_lint/lints.rs` into `diagnostics.rs`)
 - #160757 (Merge `rustc_attr_parsing/session_diagnostics.rs` into `diagnostics.rs`)
@rust-bors
rust-bors Bot merged commit 487d6a6 into rust-lang:main Aug 9, 2026
13 checks passed
@rustbot rustbot added this to the 1.99.0 milestone Aug 9, 2026
rust-timer added a commit that referenced this pull request Aug 9, 2026
Rollup merge of #160755 - JonathanBrouwer:rustc_lint_diags, r=GuillaumeGomez

Merge `rustc_lint/lints.rs` into `diagnostics.rs`

Renaming diagnostics files to all be diagnostics.rs, per the decision in rust-lang/compiler-team#1003

r? @GuillaumeGomez
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