Skip to content

Conversation

aDotInTheVoid
Copy link
Member

Closes #138378

Not sure if this should bump FORMAT_VERSION or not. CC @Enselic @LukeMathWalker @obi1kenobi

r? @GuillaumeGomez, best reviewed commit-by-commit

This makes it clearer what it's actually used for, and makes it easier
to think about modifying `Item::attributes`.
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Mar 16, 2025
@obi1kenobi
Copy link
Member

obi1kenobi commented Mar 16, 2025 via email

@Enselic
Copy link
Member

Enselic commented Mar 17, 2025

I think it's fine to not bump but I don't mind if we end up doing it.

@LukeMathWalker
Copy link
Contributor

No preference on my side. Fine to skip bumping since there's already a dedicated field for that information.

@GuillaumeGomez
Copy link
Member

Thanks!

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 17, 2025

📌 Commit 677489f has been approved by GuillaumeGomez

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. labels Mar 17, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 17, 2025
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#133870 (Stabilize `asm_goto` feature gate)
 - rust-lang#137449 (Denote `ControlFlow` as `#[must_use]`)
 - rust-lang#137465 (mir_build: Avoid some useless work when visiting "primary" bindings)
 - rust-lang#138349 (Emit function declarations for functions with `#[linkage="extern_weak"]`)
 - rust-lang#138412 (Install licenses into `share/doc/rust/licenses`)
 - rust-lang#138577 (rustdoc-json: Don't also include `#[deprecated]` in `Item::attrs`)
 - rust-lang#138588 (Avoid double lowering of idents)

Failed merges:

 - rust-lang#138321 ([bootstrap] Distribute split debuginfo if present)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b15e663 into rust-lang:master Mar 17, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 17, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 17, 2025
Rollup merge of rust-lang#138577 - aDotInTheVoid:deprecate-deprecations, r=GuillaumeGomez

rustdoc-json: Don't also include `#[deprecated]` in `Item::attrs`

Closes rust-lang#138378

Not sure if this should bump `FORMAT_VERSION` or not. CC `@Enselic` `@LukeMathWalker` `@obi1kenobi`

r? `@GuillaumeGomez,` best reviewed commit-by-commit
@aDotInTheVoid aDotInTheVoid deleted the deprecate-deprecations branch March 17, 2025 23:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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-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.

rustdoc-json: Don't include #[deprecated] in Item::attrs, as it's already in Item::deprecation
7 participants