Skip to content

Rollup of 2 pull requests#155143

Closed
jhpratt wants to merge 7 commits intorust-lang:mainfrom
jhpratt:rollup-XdSKfMy
Closed

Rollup of 2 pull requests#155143
jhpratt wants to merge 7 commits intorust-lang:mainfrom
jhpratt:rollup-XdSKfMy

Conversation

@jhpratt
Copy link
Copy Markdown
Member

@jhpratt jhpratt commented Apr 11, 2026

Successful merges:

r? @ghost

Create a similar rollup

scrabsha and others added 7 commits April 9, 2026 16:39
…szelmann

distinguish "expected a single argument" and "expected an argument" on attribute parsing
…, r=JonathanBrouwer

Use a linting node closer the parsing of `#[cfg_attr]`

The parsing of `#[cfg_attr]` unconditionally used the crate-root as a linting node to attach lints, but the `unexpected_cfgs` lint can fire when parsing the attribute and users expect to be able to allow it at places other than the crate-root.

Let's instead use the linting node id, which is unfortunately always the parent but that's better than the crate-root when you are in a sub-module.

The parsing of `#[cfg]` and other already use the expansion linting node id, so no change required there.

Related to rust-lang#155118
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Apr 11, 2026
@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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Apr 11, 2026
@jhpratt
Copy link
Copy Markdown
Member Author

jhpratt commented Apr 11, 2026

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 11, 2026

📌 Commit 207759e has been approved by jhpratt

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 Apr 11, 2026
@jhpratt jhpratt closed this Apr 11, 2026
@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 Apr 11, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 11, 2026

This pull request was unapproved due to being closed.

@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 Apr 11, 2026
@jhpratt jhpratt deleted the rollup-XdSKfMy branch April 11, 2026 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc 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