Skip to content

rustdoc: don't give depreciation notes special handling#149931

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
lolbinarycat:rustdoc-depr-html-future
Mar 10, 2026
Merged

rustdoc: don't give depreciation notes special handling#149931
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
lolbinarycat:rustdoc-depr-html-future

Conversation

@lolbinarycat
Copy link
Contributor

@lolbinarycat lolbinarycat commented Dec 12, 2025

based on discussion in #149741

we're currently using pre-wrap here which forces us to do a bunch of other hacky weird stuff, but getting rid of all that would likely break some existing docs, so i'm proposing we do it across an edition.

r? @GuillaumeGomez

@rustbot
Copy link
Collaborator

rustbot commented Dec 12, 2025

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez, @lolbinarycat

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 12, 2025
@rustbot rustbot added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Dec 12, 2025
@yotamofek
Copy link
Contributor

Gonna let Guillaume r+, but looks good to me!

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez
Copy link
Member

Just commented about this here. I'd personally just make the update without gating it behind next edition but seems like something worth discussing with the rest of the team.

@bors
Copy link
Collaborator

bors commented Jan 7, 2026

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

1 similar comment
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 7, 2026

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

@lolbinarycat
Copy link
Contributor Author

This was discussed in this month's t-rustdoc meeting, the consensus was the edition gating should be removed and the "future edition" behavior should apply to all editions.

@lolbinarycat lolbinarycat changed the title rustdoc: don't give depreciation notes special handling in future edition rustdoc: don't give depreciation notes special handling Jan 14, 2026
@lolbinarycat lolbinarycat force-pushed the rustdoc-depr-html-future branch from fdb1d6e to 88d9df0 Compare January 14, 2026 22:22
@rustbot rustbot added the A-rustdoc-js Area: Rustdoc's JS front-end label Jan 14, 2026
@rustbot
Copy link
Collaborator

rustbot commented Jan 14, 2026

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.

@rust-log-analyzer

This comment has been minimized.

@lolbinarycat lolbinarycat force-pushed the rustdoc-depr-html-future branch from 88d9df0 to 438b126 Compare January 19, 2026 20:31
@GuillaumeGomez
Copy link
Member

Thanks!

@bors r+ rollup

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 9, 2026

📌 Commit 438b126 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 Mar 9, 2026
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 9, 2026
…ure, r=GuillaumeGomez

rustdoc: don't give depreciation notes special handling

based on discussion in rust-lang#149741

we're currently using pre-wrap here which forces us to do a bunch of other hacky weird stuff, but getting rid of all that would likely break some existing docs, so i'm proposing we do it across an edition.

r? @GuillaumeGomez
rust-bors bot pushed a commit that referenced this pull request Mar 9, 2026
Rollup of 8 pull requests

Successful merges:

 - #148562 (In `Option::get_or_insert_with()`, forget the `None` instead of dropping it.)
 - #149931 (rustdoc: don't give depreciation notes special handling)
 - #153608 (ast_passes: unsupported arch w/ scalable vectors)
 - #153609 (Add missing `Diag::with_span_suggestion_with_style` method)
 - #153610 (Only lint unused features if they are unstable)
 - #153616 (Update `sysinfo` version to `0.38.4`)
 - #153619 (Update books)
 - #153624 (Ping fmease on parser modifications)
rust-bors bot pushed a commit that referenced this pull request Mar 10, 2026
Rollup of 7 pull requests

Successful merges:

 - #149931 (rustdoc: don't give depreciation notes special handling)
 - #153608 (ast_passes: unsupported arch w/ scalable vectors)
 - #153609 (Add missing `Diag::with_span_suggestion_with_style` method)
 - #153610 (Only lint unused features if they are unstable)
 - #153616 (Update `sysinfo` version to `0.38.4`)
 - #153619 (Update books)
 - #153624 (Ping fmease on parser modifications)
@lolbinarycat lolbinarycat added the relnotes Marks issues that should be documented in the release notes of the next release. label Mar 10, 2026
@rust-bors rust-bors bot merged commit b60f58f into rust-lang:main Mar 10, 2026
11 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 10, 2026
rust-timer added a commit that referenced this pull request Mar 10, 2026
Rollup merge of #149931 - lolbinarycat:rustdoc-depr-html-future, r=GuillaumeGomez

rustdoc: don't give depreciation notes special handling

based on discussion in #149741

we're currently using pre-wrap here which forces us to do a bunch of other hacky weird stuff, but getting rid of all that would likely break some existing docs, so i'm proposing we do it across an edition.

r? @GuillaumeGomez
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-rustdoc-js Area: Rustdoc's JS front-end relnotes Marks issues that should be documented in the release notes of the next release. 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants