Skip to content

rework handling of doc attributes on macro calls - #161514

Open
mejrs wants to merge 1 commit into
rust-lang:mainfrom
mejrs:move_doc_feature_gating
Open

rework handling of doc attributes on macro calls#161514
mejrs wants to merge 1 commit into
rust-lang:mainfrom
mejrs:move_doc_feature_gating

Conversation

@mejrs

@mejrs mejrs commented Aug 22, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

#160904 but with the fcw changes removed

r? @JonathanBrouwer

@rustbot

rustbot commented Aug 22, 2026

Copy link
Copy Markdown
Collaborator

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann, @JonathanBrouwer

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@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 Aug 22, 2026
@mejrs mejrs mentioned this pull request Aug 22, 2026
Open
JonathanBrouwer
JonathanBrouwer reviewed Aug 22, 2026
View reviewed changes
Comment thread tests/ui/feature-gates/feature-gate-rustdoc_internals.stderr
error[E0658]: this subset of the `doc` attribute is meant for internal use only
--> $DIR/feature-gate-rustdoc_internals.rs:11:3
|
LL | #[doc(fake_variadic)]

@JonathanBrouwer JonathanBrouwer Aug 22, 2026 •
edited by rustbot
Loading

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.

Could you make this point to fake_variadic rather than doc?

View changes since the review

@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 Aug 22, 2026
JonathanBrouwer
JonathanBrouwer reviewed Aug 22, 2026
View reviewed changes
Comment thread compiler/rustc_attr_parsing/src/interface.rs
@mejrs
mejrs force-pushed the move_doc_feature_gating branch from 639ab86 to 6c8b490 Compare August 22, 2026 22:16
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@mejrs
mejrs force-pushed the move_doc_feature_gating branch from 6c8b490 to 34bac0b Compare August 22, 2026 22:32
@mejrs

mejrs commented Aug 23, 2026

Copy link
Copy Markdown
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 23, 2026
JonathanBrouwer
JonathanBrouwer approved these changes Aug 28, 2026
View reviewed changes

@JonathanBrouwer JonathanBrouwer left a comment •
edited by rustbot
Loading

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.

@bors r+ rollup

View changes since this review

@rust-bors

rust-bors Bot commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 34bac0b 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 Aug 28, 2026
JonathanBrouwer
JonathanBrouwer reviewed Aug 28, 2026
View reviewed changes
Comment thread compiler/rustc_attr_parsing/src/attributes/doc.rs
no_args_and_not_crate_level!(search_unbox)
}
Some(sym::rust_logo) => {
// FIXME: Only feature gated at the crate level (!!)

@JonathanBrouwer JonathanBrouwer Aug 28, 2026 •
edited by rustbot
Loading

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.

Could you document all the things that need to be fixed in issues? I think that's this

View changes since the review

JonathanBrouwer
JonathanBrouwer reviewed Aug 28, 2026
View reviewed changes
Comment thread compiler/rustc_attr_parsing/src/interface.rs
}

// FIXME accidentally allowed on Stable Rust
if target == Target::MacroCall && is_doc_non_lit_expr(attr) {

@JonathanBrouwer JonathanBrouwer Aug 28, 2026 •
edited by rustbot
Loading

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.

And this

View changes since the review

@mejrs mejrs Aug 28, 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.

Is #160880

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 28, 2026
@JonathanBrouwer
Rollup merge of rust-lang#161514 - mejrs:move_doc_feature_gating, r=J…
4e736c7 
…onathanBrouwer

rework handling of doc attributes on macro calls

 rust-lang#160904 but with the fcw changes removed

r? @JonathanBrouwer
@JonathanBrouwer JonathanBrouwer mentioned this pull request Aug 28, 2026
Closed
@JonathanBrouwer

JonathanBrouwer commented Aug 28, 2026

Copy link
Copy Markdown
Member

💔 I suspect this PR failed tests as part of a rollup
@bors r-

After fixing the problem, consider running a try job for the failed job before re-approving.

Link to failure: #161934 (comment)

@rust-bors rust-bors Bot 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 28, 2026
@rust-bors

rust-bors Bot commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved.

This PR was contained in a rollup (#161934), which was unapproved.

View changes since this unapproval

@mejrs
mejrs force-pushed the move_doc_feature_gating branch from 34bac0b to 6d61487 Compare August 28, 2026 18:01
@rustbot

rustbot commented Aug 28, 2026

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.

@mejrs
mejrs force-pushed the move_doc_feature_gating branch from 6d61487 to ab7d048 Compare August 28, 2026 18:06
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@mejrs
mejrs force-pushed the move_doc_feature_gating branch from ab7d048 to 9529e2d Compare August 28, 2026 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JonathanBrouwer JonathanBrouwer JonathanBrouwer approved these changes

Assignees

@JonathanBrouwer JonathanBrouwer

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

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