Skip to content

Rework #[cold] attribute parser #142491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Jun 21, 2025
Merged

Rework #[cold] attribute parser #142491

merged 2 commits into from
Jun 21, 2025

Conversation

jdonszelmann
Copy link
Contributor

@jdonszelmann jdonszelmann commented Jun 14, 2025 •
edited
Loading

@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-rustdoc-json Area: Rustdoc JSON backend 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 Jun 14, 2025
This was referenced Jun 14, 2025
Open
Merged
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented Jun 16, 2025

☔ The latest upstream changes (presumably #142589) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 16, 2025
@jdonszelmann jdonszelmann force-pushed the cold branch 2 times, most recently from 3db6951 to 414d859 Compare June 18, 2025 12:06
@bors
Copy link
Collaborator

bors commented Jun 19, 2025

☔ The latest upstream changes (presumably #142697) made this pull request unmergeable. Please resolve the merge conflicts.

@jdonszelmann jdonszelmann mentioned this pull request Jun 20, 2025
Merged
@jdonszelmann jdonszelmann marked this pull request as ready for review June 20, 2025 13:11
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 20, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 20, 2025

rustdoc-json-types is a public (although nightly-only) API. If possible, consider changing src/librustdoc/json/conversions.rs; otherwise, make sure you bump the FORMAT_VERSION constant.

cc @CraftSpider, @aDotInTheVoid, @Enselic, @obi1kenobi

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

@jdonszelmann
Copy link
Contributor Author

@aDotInTheVoid just another version bump of json because another attr changed. I'll consistently do that from now on until I'll fix it properly. I don't mind putting some time in to actually add it to rustdoc proper :)

@oli-obk
Copy link
Contributor

oli-obk commented Jun 20, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 20, 2025

📌 Commit b9107a8 has been approved by oli-obk

It is now in the queue for this repository.

@bors bors 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. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 20, 2025
@tgross35 tgross35 mentioned this pull request Jun 20, 2025
Merged
bors added a commit that referenced this pull request Jun 20, 2025
@bors
Auto merge of #142794 - tgross35:rollup-iae7okj, r=tgross35
710a45d 
Rollup of 9 pull requests

Successful merges:

 - #142331 (Add `trim_prefix` and `trim_suffix` methods for both `slice` and `str` types.)
 - #142491 (Rework #[cold] attribute parser)
 - #142494 (Fix missing docs in `rustc_attr_parsing`)
 - #142495 (Better template for `#[repr]` attributes)
 - #142497 (Fix random failure when JS code is executed when the whole file was not read yet)
 - #142575 (Ensure copy* intrinsics also perform the static self-init checks)
 - #142650 (Refactor Translator)
 - #142713 (mbe: Refactor transcription)
 - #142755 (rustdoc: Remove `FormatRenderer::cache`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Jun 20, 2025
@bors
Auto merge of #142794 - tgross35:rollup-iae7okj, r=tgross35
15c701f 
Rollup of 9 pull requests

Successful merges:

 - #142331 (Add `trim_prefix` and `trim_suffix` methods for both `slice` and `str` types.)
 - #142491 (Rework #[cold] attribute parser)
 - #142494 (Fix missing docs in `rustc_attr_parsing`)
 - #142495 (Better template for `#[repr]` attributes)
 - #142497 (Fix random failure when JS code is executed when the whole file was not read yet)
 - #142575 (Ensure copy* intrinsics also perform the static self-init checks)
 - #142650 (Refactor Translator)
 - #142713 (mbe: Refactor transcription)
 - #142755 (rustdoc: Remove `FormatRenderer::cache`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f0374dc into rust-lang:master Jun 21, 2025
10 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 21, 2025
rust-timer added a commit that referenced this pull request Jun 21, 2025
@rust-timer
Unrolled build for #142491
8b18a20 
Rollup merge of #142491 - jdonszelmann:cold, r=oli-obk

Rework #[cold] attribute parser

r? `@oli-obk`
@nnethercote
Copy link
Contributor

@aDotInTheVoid just another version bump of json because another attr changed. I'll consistently do that from now on until I'll fix it properly. I don't mind putting some time in to actually add it to rustdoc proper :)

What's the issue with attr changes? It's odd to see FORMAT_VERSION change without any other rustdoc code changing.

@obi1kenobi
Copy link
Member

obi1kenobi commented Jun 21, 2025 via email

@jdonszelmann
Copy link
Contributor Author

@nnethercote effectively that's the problem. We discovered that attributes are put in rustdoc verbatim meaning no rustdoc code has to change and still it's a problem.... We will build a better solution, but I'm afraid it'll take a little bit.

@nnethercote nnethercote mentioned this pull request Jun 22, 2025
Closed
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Jun 23, 2025
@bors
Auto merge of #142794 - tgross35:rollup-iae7okj, r=tgross35
f13e313 
Rollup of 9 pull requests

Successful merges:

 - rust-lang/rust#142331 (Add `trim_prefix` and `trim_suffix` methods for both `slice` and `str` types.)
 - rust-lang/rust#142491 (Rework #[cold] attribute parser)
 - rust-lang/rust#142494 (Fix missing docs in `rustc_attr_parsing`)
 - rust-lang/rust#142495 (Better template for `#[repr]` attributes)
 - rust-lang/rust#142497 (Fix random failure when JS code is executed when the whole file was not read yet)
 - rust-lang/rust#142575 (Ensure copy* intrinsics also perform the static self-init checks)
 - rust-lang/rust#142650 (Refactor Translator)
 - rust-lang/rust#142713 (mbe: Refactor transcription)
 - rust-lang/rust#142755 (rustdoc: Remove `FormatRenderer::cache`)

r? `@ghost`
`@rustbot` modify labels: rollup
@aDotInTheVoid
Copy link
Member

See #141358 for details of what a "better solution" means here, and aDotInTheVoid@9be4e00 for a very WIP implementation

@aDotInTheVoid aDotInTheVoid mentioned this pull request Jun 23, 2025
Merged
@aDotInTheVoid
Copy link
Member

And #142936 for an implementation.

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 24, 2025
@GuillaumeGomez
Rollup merge of rust-lang#142919 - aDotInTheVoid:cold-cold-attr-for-y…
0512c82 
…ou, r=GuillaumeGomez

rustdoc-json: Add test for `#[cold]`

Follow-up to rust-lang#142491

r? `@GuillaumeGomez`

CC `@jdonszelmann`
rust-timer added a commit that referenced this pull request Jun 24, 2025
@rust-timer
Unrolled build for #142919
96fa09d 
Rollup merge of #142919 - aDotInTheVoid:cold-cold-attr-for-you, r=GuillaumeGomez

rustdoc-json: Add test for `#[cold]`

Follow-up to #142491

r? `@GuillaumeGomez`

CC `@jdonszelmann`
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request Jun 26, 2025
@bors
Auto merge of #142794 - tgross35:rollup-iae7okj, r=tgross35
f53cd2b 
Rollup of 9 pull requests

Successful merges:

 - rust-lang/rust#142331 (Add `trim_prefix` and `trim_suffix` methods for both `slice` and `str` types.)
 - rust-lang/rust#142491 (Rework #[cold] attribute parser)
 - rust-lang/rust#142494 (Fix missing docs in `rustc_attr_parsing`)
 - rust-lang/rust#142495 (Better template for `#[repr]` attributes)
 - rust-lang/rust#142497 (Fix random failure when JS code is executed when the whole file was not read yet)
 - rust-lang/rust#142575 (Ensure copy* intrinsics also perform the static self-init checks)
 - rust-lang/rust#142650 (Refactor Translator)
 - rust-lang/rust#142713 (mbe: Refactor transcription)
 - rust-lang/rust#142755 (rustdoc: Remove `FormatRenderer::cache`)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 27, 2025
Open
tautschnig pushed a commit to model-checking/verify-rust-std that referenced this pull request Jul 3, 2025
@bors
Auto merge of rust-lang#142794 - tgross35:rollup-iae7okj, r=tgross35
6f6900e 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#142331 (Add `trim_prefix` and `trim_suffix` methods for both `slice` and `str` types.)
 - rust-lang#142491 (Rework #[cold] attribute parser)
 - rust-lang#142494 (Fix missing docs in `rustc_attr_parsing`)
 - rust-lang#142495 (Better template for `#[repr]` attributes)
 - rust-lang#142497 (Fix random failure when JS code is executed when the whole file was not read yet)
 - rust-lang#142575 (Ensure copy* intrinsics also perform the static self-init checks)
 - rust-lang#142650 (Refactor Translator)
 - rust-lang#142713 (mbe: Refactor transcription)
 - rust-lang#142755 (rustdoc: Remove `FormatRenderer::cache`)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-rustdoc-json Area: Rustdoc JSON backend 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.89.0
Development

Successfully merging this pull request may close these issues.
8 participants
@jdonszelmann @rust-log-analyzer @bors @rustbot @oli-obk @nnethercote @obi1kenobi @aDotInTheVoid