`librustdoc`: 2024 edition! 🎊 #137722

yotamofek · 2025-02-27T11:40:38Z

Like #137333 , but for rustdoc 😁

rustbot · 2025-02-27T11:40:42Z

rustbot has assigned @notriddle.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

notriddle · 2025-02-27T17:30:51Z

src/librustdoc/html/render/print_item.rs

-        fn render_assoc_items<'b>(&'b self) -> impl fmt::Display + Captures<'a> + 'b + Captures<'cx> {
-            fmt::from_fn(move |f| {
-                let (item, cx) = self.item_and_cx();
-                let def_id = item.item_id.expect_def_id();
-                let v = render_assoc_items(cx, item, def_id, AssocItemRender::All);
-                write!(f, "{v}")
-            })
+        fn render_assoc_items(&self) -> impl fmt::Display {
+            let (item, cx) = self.item_and_cx();
+            let def_id = item.item_id.expect_def_id();
+            render_assoc_items(cx, item, def_id, AssocItemRender::All)


This is a change that can actually affect execution, not just lifetime metadata.

This still looks file (render_assoc_items itself returns impl Display), but it's still worth tracking.

Yeah, you're right, but seeing as I added all of these fmt::from_fn()s myself, I'm confident about deleting them again. :)

notriddle · 2025-02-27T17:31:04Z

@bors r+ rollup=never

bors · 2025-02-27T17:31:07Z

📌 Commit 7d263b0 has been approved by notriddle

It is now in the queue for this repository.

bors · 2025-02-27T17:31:07Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

compiler-errors · 2025-03-01T19:55:28Z

@bors rollup-

… r=notriddle `librustdoc`: 2024 edition! 🎊 Like rust-lang#137333 , but for rustdoc 😁

bors · 2025-03-02T16:54:25Z

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

yotamofek · 2025-03-02T18:42:36Z

@notriddle had to fix conflicts with #137425 , would appreciate another review/approval (should be quick - nothing actually changed from the last iteration)

aDotInTheVoid · 2025-03-02T21:16:56Z

@rustbot ready

notriddle · 2025-03-02T21:55:50Z

@bors r+

bors · 2025-03-02T21:55:52Z

📌 Commit 74c783c has been approved by notriddle

It is now in the queue for this repository.

… r=notriddle `librustdoc`: 2024 edition! 🎊 Like rust-lang#137333 , but for rustdoc 😁

…iaskrgr Rollup of 12 pull requests Successful merges: - rust-lang#136975 (Look for `python3` first on MacOS, not `py`) - rust-lang#137240 (Slightly reformat `std::fs::remove_dir_all` error docs) - rust-lang#137303 (Remove `MaybeForgetReturn` suggestion) - rust-lang#137463 ([illumos] attempt to use posix_spawn to spawn processes) - rust-lang#137722 (`librustdoc`: 2024 edition! 🎊) - rust-lang#137758 (fix usage of ty decl macro fragments in attributes) - rust-lang#137772 (Fix char count in `Display` for `ByteStr`) - rust-lang#137805 (adjust Layout debug printing to match the internal field name) - rust-lang#137808 (Do not require that unsafe fields lack drop glue) - rust-lang#137913 (Allow struct field default values to reference struct's generics) - rust-lang#137963 (Add ``dyn`` keyword to `E0373` examples) - rust-lang#137975 (Remove unused `PpMode::needs_hir`) r? `@ghost` `@rustbot` modify labels: rollup

… r=notriddle `librustdoc`: 2024 edition! 🎊 Like rust-lang#137333 , but for rustdoc 😁

Rollup of 13 pull requests Successful merges: - rust-lang#136581 (Retire the legacy `Makefile`-based `run-make` test infra) - rust-lang#136865 (Perform deeper compiletest path normalization for `$TEST_BUILD_DIR` to account for compare-mode/debugger cases, and normalize long type file filename hashes) - rust-lang#137147 (Add exclude to config.toml) - rust-lang#137327 (Undeprecate env::home_dir) - rust-lang#137463 ([illumos] attempt to use posix_spawn to spawn processes) - rust-lang#137477 (uefi: Add Service Binding Protocol abstraction) - rust-lang#137502 (Don't include global asm in `mir_keys`, fix error body synthesis) - rust-lang#137534 ([rustdoc] hide item that is not marked as doc(inline) and whose src is doc(hidden)) - rust-lang#137565 (Try to point of macro expansion from resolver and method errors if it involves macro var) - rust-lang#137643 (Add DWARF test case for non-C-like `repr128` enums) - rust-lang#137722 (`librustdoc`: 2024 edition! 🎊) - rust-lang#137836 (Set `target_vendor = "openwrt"` on `mips64-openwrt-linux-musl`) - rust-lang#137949 (Update MSVC INSTALL.md instructions to recommend VS 2022 + recent Windows 10/11 SDK) Failed merges: - rust-lang#137798 (ci: use ubuntu 24 on arm large runner) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2025-03-04T08:10:23Z

@bors r-
failed in #137982

Get rid of the `Captures` hack

yotamofek · 2025-03-04T12:11:56Z

@rustbot ready

notriddle · 2025-03-04T19:04:17Z

@bors r+

bors · 2025-03-04T19:04:19Z

📌 Commit 6e86aa1 has been approved by notriddle

It is now in the queue for this repository.

…kingjubilee Rollup of 6 pull requests Successful merges: - rust-lang#137077 (Postprocess bootstrap metrics into GitHub job summary) - rust-lang#137373 (Compile run-make-support and run-make tests with the bootstrap compiler) - rust-lang#137634 (Update `compiler-builtins` to 0.1.149) - rust-lang#137667 (Add `dist::Gcc` build step) - rust-lang#137722 (`librustdoc`: 2024 edition! 🎊) - rust-lang#137947 (Do not install rustup on Rust for Linux job) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#137722 - yotamofek:pr/rustdoc/edition-2024, r=notriddle `librustdoc`: 2024 edition! 🎊 Like rust-lang#137333 , but for rustdoc 😁

rustbot assigned notriddle Feb 27, 2025

yotamofek force-pushed the pr/rustdoc/edition-2024 branch from 7b074e9 to 7d263b0 Compare February 27, 2025 12:13

notriddle reviewed Feb 27, 2025

View reviewed changes

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 Feb 27, 2025

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 2, 2025

Rollup merge of rust-lang#137722 - yotamofek:pr/rustdoc/edition-2024,…

84eab4b

… r=notriddle `librustdoc`: 2024 edition! 🎊 Like rust-lang#137333 , but for rustdoc 😁

matthiaskrgr mentioned this pull request Mar 2, 2025

Rollup of 10 pull requests #137877

Closed

tgross35 added a commit to tgross35/rust that referenced this pull request Mar 2, 2025

Rollup merge of rust-lang#137722 - yotamofek:pr/rustdoc/edition-2024,…

b53fa79

… r=notriddle `librustdoc`: 2024 edition! 🎊 Like rust-lang#137333 , but for rustdoc 😁

tgross35 mentioned this pull request Mar 2, 2025

Rollup of 10 pull requests #137879

Closed

bors 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 Mar 2, 2025

yotamofek force-pushed the pr/rustdoc/edition-2024 branch from 7d263b0 to 74c783c Compare March 2, 2025 18:37

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 Mar 2, 2025

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 2, 2025

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 4, 2025

Rollup merge of rust-lang#137722 - yotamofek:pr/rustdoc/edition-2024,…

f29531d

… r=notriddle `librustdoc`: 2024 edition! 🎊 Like rust-lang#137333 , but for rustdoc 😁

matthiaskrgr mentioned this pull request Mar 4, 2025

Rollup of 13 pull requests #137980

Closed

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 4, 2025

Rollup merge of rust-lang#137722 - yotamofek:pr/rustdoc/edition-2024,…

01d6bcf

… r=notriddle `librustdoc`: 2024 edition! 🎊 Like rust-lang#137333 , but for rustdoc 😁

matthiaskrgr mentioned this pull request Mar 4, 2025

Rollup of 12 pull requests #137982

Closed

jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 4, 2025

Rollup merge of rust-lang#137722 - yotamofek:pr/rustdoc/edition-2024,…

d9a357e

… r=notriddle `librustdoc`: 2024 edition! 🎊 Like rust-lang#137333 , but for rustdoc 😁

jhpratt mentioned this pull request Mar 4, 2025

Rollup of 13 pull requests #137985

Closed

bors 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 Mar 4, 2025

yotamofek added 2 commits March 4, 2025 12:35

librustdoc: 2024 edition! 🎊

00523bf

Adapt librustdoc to 2024 edition lifetieme capture rules

6e86aa1

Get rid of the `Captures` hack

yotamofek force-pushed the pr/rustdoc/edition-2024 branch from 74c783c to 6e86aa1 Compare March 4, 2025 10:36

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 Mar 4, 2025

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 4, 2025

workingjubilee mentioned this pull request Mar 4, 2025

Rollup of 6 pull requests #138021

Merged

bors merged commit dcc85e3 into rust-lang:master Mar 5, 2025
6 checks passed

rustbot added this to the 1.87.0 milestone Mar 5, 2025

yotamofek deleted the pr/rustdoc/edition-2024 branch March 5, 2025 06:10

librustdoc: 2024 edition! 🎊 #137722

librustdoc: 2024 edition! 🎊 #137722

Uh oh!

Conversation

yotamofek commented Feb 27, 2025

Uh oh!

rustbot commented Feb 27, 2025

Uh oh!

notriddle Feb 27, 2025

Choose a reason for hiding this comment

Uh oh!

yotamofek Mar 2, 2025

Choose a reason for hiding this comment

Uh oh!

notriddle commented Feb 27, 2025

Uh oh!

bors commented Feb 27, 2025

Uh oh!

bors commented Feb 27, 2025

Uh oh!

compiler-errors commented Mar 1, 2025

Uh oh!

bors commented Mar 2, 2025

Uh oh!

yotamofek commented Mar 2, 2025

Uh oh!

aDotInTheVoid commented Mar 2, 2025

Uh oh!

notriddle commented Mar 2, 2025

Uh oh!

bors commented Mar 2, 2025

Uh oh!

matthiaskrgr commented Mar 4, 2025

Uh oh!

yotamofek commented Mar 4, 2025

Uh oh!

notriddle commented Mar 4, 2025

Uh oh!

bors commented Mar 4, 2025

Uh oh!

Uh oh!

Uh oh!

`librustdoc`: 2024 edition! 🎊 #137722

`librustdoc`: 2024 edition! 🎊 #137722