librustdoc: more usages of `Joined::joined` #136599

yotamofek · 2025-02-05T19:12:04Z

Some missed opportunities from #136244
r? @GuillaumeGomez since you reviewed the last one (feel free to re-assign, of course 😊)
First two commits are just drive-by cleanups

yotamofek · 2025-02-05T19:13:53Z

src/librustdoc/html/render/print_item.rs

-                        .filter_map(|s| if !s.is_empty() { Some(s.as_str()) } else { None })
-                        .collect::<Vec<_>>()
-                        .join(" "),
+                    title = format_args!("{} {}", myitem.type_(), full_path(cx, myitem)),


looked a little deeper at this and turned out neither myitem.type_() or full_path(...) can ever be empty, so the whole joined-array thing is unneeded

yotamofek · 2025-02-05T19:17:44Z

src/librustdoc/clean/utils.rs

+            .iter()
+            .map(|seg| {
+                fmt::from_fn(|f| {
+                    if seg.ident.name != kw::PathRoot {


The logic here is weird (pre-existing).
The kw::PathRoot should only ever be the first segment, I think. And we wouldn't want to join two "::"s together anyways.

GuillaumeGomez · 2025-02-05T19:40:57Z

Wow, you're on fire. :D

Let's check perf results then!

@bors try @rust-timer queue

bors · 2025-02-05T19:42:07Z

⌛ Trying commit 2341962 with merge 2ffed9b...

…<try> librustdoc: more usages of `Joined::joined` Some missed opportunities from rust-lang#136244 r? `@GuillaumeGomez` since you reviewed the last one (feel free to re-assign, of course 😊) First two commits are just drive-by cleanups

bors · 2025-02-05T21:32:42Z

☀️ Try build successful - checks-actions
Build commit: 2ffed9b (2ffed9b0223e35c5c90123aee8a6868058ebb856)

yotamofek · 2025-02-06T07:20:22Z

@GuillaumeGomez I think the perf bot didn't work?

GuillaumeGomez · 2025-02-06T10:06:21Z

Ah indeed. Let's try again.

@rust-timer queue

GuillaumeGomez · 2025-02-06T14:03:46Z

Still not apparently. Fun times.

@rust-timer build 2ffed9b

rust-timer · 2025-02-06T20:04:27Z

Finished benchmarking commit (2ffed9b): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary -0.2%, secondary 2.1%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.6%	[1.6%, 1.6%]	1
Regressions ❌ (secondary)	2.1%	[2.1%, 2.1%]	1
Improvements ✅ (primary)	-2.1%	[-2.1%, -2.1%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.2%	[-2.1%, 1.6%]	2

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 778.801s -> 776.752s (-0.26%)
Artifact size: 328.78 MiB -> 328.82 MiB (0.01%)

bors · 2025-02-15T15:49:49Z

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

GuillaumeGomez · 2025-02-17T13:18:54Z

src/librustdoc/html/render/print_item.rs

-                        _ => unreachable!(),
-                    }
-                }
+                write_str(


I find this code much less good compared to the current one.

I agree. I'll try to re-write and if I can't make it nicer I'll just revert this part.

Reverted this part for now. (in a separate commit, will rebase if this PR is approved)

src/librustdoc/html/render/print_item.rs

GuillaumeGomez · 2025-02-17T22:38:51Z

Ping me once squashed. :)

yotamofek · 2025-02-18T09:01:02Z

@GuillaumeGomez ping :)

GuillaumeGomez · 2025-02-18T09:38:01Z

Thanks!

@bors r+ rollup

bors · 2025-02-18T09:38:04Z

📌 Commit c0b1c6e has been approved by GuillaumeGomez

It is now in the queue for this repository.

…r=GuillaumeGomez librustdoc: more usages of `Joined::joined` Some missed opportunities from rust-lang#136244 r? `@GuillaumeGomez` since you reviewed the last one (feel free to re-assign, of course 😊) First two commits are just drive-by cleanups

…llaumeGomez Rollup of 11 pull requests Successful merges: - rust-lang#127793 (Added project-specific Zed IDE settings) - rust-lang#134995 (Stabilize const_slice_flatten) - rust-lang#135767 (Future incompatibility warning `unsupported_fn_ptr_calling_conventions`: Also warn in dependencies) - rust-lang#136599 (librustdoc: more usages of `Joined::joined`) - rust-lang#136750 (Make ub_check message clear that it's not an assert) - rust-lang#137000 (Deeply normalize item bounds in new solver) - rust-lang#137126 (fix docs for inherent str constructors) - rust-lang#137151 (Install more signal stack trace handlers) - rust-lang#137161 (Pattern Migration 2024: fix incorrect messages/suggestions when errors arise in macro expansions) - rust-lang#137167 (tests: Also gate `f16::erfc()` doctest with `reliable_f16_math` cfg) - rust-lang#137177 (Update `minifier-rs` version to `0.3.5`) r? `@ghost` `@rustbot` modify labels: rollup

…r=GuillaumeGomez librustdoc: more usages of `Joined::joined` Some missed opportunities from rust-lang#136244 r? ``@GuillaumeGomez`` since you reviewed the last one (feel free to re-assign, of course 😊) First two commits are just drive-by cleanups

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#135711 (Do not ICE on default_field_value const with lifetimes) - rust-lang#136599 (librustdoc: more usages of `Joined::joined`) - rust-lang#136876 (Locking documentation updates) - rust-lang#137000 (Deeply normalize item bounds in new solver) - rust-lang#137126 (fix docs for inherent str constructors) - rust-lang#137161 (Pattern Migration 2024: fix incorrect messages/suggestions when errors arise in macro expansions) - rust-lang#137191 (Update mdbook and move error_index_generator) - rust-lang#137203 (Improve MIR modification) - rust-lang#137206 (Make E0599 a structured error) - rust-lang#137218 (misc `layout_of` cleanup) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#136599 - yotamofek:pr/rustdoc-more-joined, r=GuillaumeGomez librustdoc: more usages of `Joined::joined` Some missed opportunities from rust-lang#136244 r? ```@GuillaumeGomez``` since you reviewed the last one (feel free to re-assign, of course 😊) First two commits are just drive-by cleanups

rustbot assigned GuillaumeGomez Feb 5, 2025

rustbot added 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 Feb 5, 2025

yotamofek commented Feb 5, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 5, 2025

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 6, 2025

yotamofek mentioned this pull request Feb 6, 2025

librustdoc: remove unused for_html field from Buffer 🦄 #136656

Closed

yotamofek force-pushed the pr/rustdoc-more-joined branch from 2341962 to 4457ce5 Compare February 14, 2025 17:01

yotamofek force-pushed the pr/rustdoc-more-joined branch from 4457ce5 to 91df3fa Compare February 15, 2025 16:02

rustbot added the T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. label Feb 15, 2025

GuillaumeGomez reviewed Feb 17, 2025

View reviewed changes

src/librustdoc/html/render/print_item.rs Show resolved Hide resolved

yotamofek added 2 commits February 17, 2025 18:38

use Iterator::zip instead of enumerating+indexing

a7a43cd

coalesce match patterns with identical bodies

4a76615

yotamofek force-pushed the pr/rustdoc-more-joined branch from 91df3fa to 12abbb2 Compare February 17, 2025 18:43

GuillaumeGomez approved these changes Feb 17, 2025

View reviewed changes

librustdoc: more usages of Joined::joined

c0b1c6e

yotamofek force-pushed the pr/rustdoc-more-joined branch from 12abbb2 to c0b1c6e Compare February 17, 2025 22:55

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

GuillaumeGomez mentioned this pull request Feb 18, 2025

Rollup of 11 pull requests #137212

Closed

This was referenced Feb 18, 2025

Rollup of 11 pull requests #137234

Closed

Rollup of 10 pull requests #137235

Merged

bors merged commit 58a622b into rust-lang:master Feb 19, 2025
6 checks passed

rustbot added this to the 1.87.0 milestone Feb 19, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

librustdoc: more usages of `Joined::joined` #136599

librustdoc: more usages of `Joined::joined` #136599

yotamofek commented Feb 5, 2025

yotamofek Feb 5, 2025

yotamofek Feb 5, 2025

GuillaumeGomez commented Feb 5, 2025

This comment has been minimized.

bors commented Feb 5, 2025

bors commented Feb 5, 2025

yotamofek commented Feb 6, 2025

GuillaumeGomez commented Feb 6, 2025

This comment has been minimized.

GuillaumeGomez commented Feb 6, 2025

This comment has been minimized.

rust-timer commented Feb 6, 2025

bors commented Feb 15, 2025

GuillaumeGomez Feb 17, 2025

yotamofek Feb 17, 2025

yotamofek Feb 17, 2025

GuillaumeGomez commented Feb 17, 2025

yotamofek commented Feb 18, 2025

GuillaumeGomez commented Feb 18, 2025

bors commented Feb 18, 2025

librustdoc: more usages of Joined::joined #136599

librustdoc: more usages of Joined::joined #136599

Conversation

yotamofek commented Feb 5, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GuillaumeGomez commented Feb 5, 2025

This comment has been minimized.

bors commented Feb 5, 2025

bors commented Feb 5, 2025

yotamofek commented Feb 6, 2025

GuillaumeGomez commented Feb 6, 2025

This comment has been minimized.

GuillaumeGomez commented Feb 6, 2025

This comment has been minimized.

rust-timer commented Feb 6, 2025

Overall result: no relevant changes - no action needed

bors commented Feb 15, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GuillaumeGomez commented Feb 17, 2025

yotamofek commented Feb 18, 2025

GuillaumeGomez commented Feb 18, 2025

bors commented Feb 18, 2025

librustdoc: more usages of `Joined::joined` #136599

librustdoc: more usages of `Joined::joined` #136599