rustdoc: cross-crate re-exports: correctly render late-bound params in source order even if early-bound params are present #121022

fmease · 2024-02-13T10:55:57Z

r? ghost

fmease · 2024-02-13T10:57:35Z

Let's see how bad perf is for the unoptimized version. However, the benchmark suite might not properly cover this scenario.

@bors try @rust-timer queue

…-src-order, r=<try> rustdoc: cross-crate re-exports: correctly render late-bound params in source order even if early-bound params are present r? ghost

bors · 2024-02-13T10:58:46Z

⌛ Trying commit c19c531 with merge 7d7a418...

src/librustdoc/html/format.rs

src/librustdoc/clean/mod.rs

bors · 2024-02-13T12:27:27Z

☀️ Try build successful - checks-actions
Build commit: 7d7a418 (7d7a4189aa83796a6cd2ddda11287bd2f24bd0cf)

rust-timer · 2024-02-13T17:08:44Z

Finished benchmarking commit (7d7a418): comparison URL.

Overall result: ❌ regressions - 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 is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	2.6%	[2.6%, 2.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

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

Cycles

Results

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)	-	-	0
Regressions ❌ (secondary)	2.3%	[2.3%, 2.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 662.695s -> 662.981s (0.04%)
Artifact size: 308.49 MiB -> 308.50 MiB (0.00%)

fmease · 2024-02-14T17:11:02Z

#121022 (comment)

Spurious, not a doc regression.
@bors rollup=maybe

fmease · 2024-02-14T18:24:33Z

tests/rustdoc/inline_cross/early-late-bound-lifetime-params.rs

+// edition:2021
+
+// @has usr/fn.f.html
+// @has - '//pre[@class="rust item-decl"]' "fn f<'a, 'b, 'c, 'd, T, const N: usize>(_: impl Copy)"


Both items used to be rendered like

pub fn f<'b, 'd, T, const N: usize, 'a, 'c>(_: impl Copy)

rustbot · 2024-02-14T18:24:59Z

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

fmease · 2024-02-14T18:25:06Z

r? rustdoc

fmease · 2024-02-14T18:27:59Z

Eh, since I changed some things around, let's check perf again.
@bors try @rust-timer queue

bors · 2024-02-14T18:29:10Z

⌛ Trying commit d4a5de3 with merge 13dfdc4...

…-src-order, r=<try> rustdoc: cross-crate re-exports: correctly render late-bound params in source order even if early-bound params are present r? ghost

bors · 2024-02-14T19:57:40Z

☀️ Try build successful - checks-actions
Build commit: 13dfdc4 (13dfdc414a5daeb8fc0e3da1010d96dc82a7bd08)

rust-timer · 2024-02-14T22:33:08Z

Finished benchmarking commit (13dfdc4): 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)

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

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: 635.176s -> 636.701s (0.24%)
Artifact size: 306.13 MiB -> 306.07 MiB (-0.02%)

GuillaumeGomez · 2024-02-15T00:28:30Z

src/librustdoc/clean/types.rs

@@ -1339,13 +1339,14 @@ impl GenericParamDefKind {

 #[derive(Clone, PartialEq, Eq, Debug, Hash)]
 pub(crate) struct GenericParamDef {
+ pub(crate) did: DefId,


Nitpicking: please use def_id. We tend to use this over did in rustdoc as much as we can and I'd like this trend to continue. :)

GuillaumeGomez · 2024-02-15T00:28:36Z

src/librustdoc/clean/types.rs

 pub(crate) name: Symbol,
 pub(crate) kind: GenericParamDefKind,
 }

 impl GenericParamDef {
- pub(crate) fn lifetime(name: Symbol) -> Self {
- Self { name, kind: GenericParamDefKind::Lifetime { outlives: ThinVec::new() } }
+ pub(crate) fn lifetime(did: DefId, name: Symbol) -> Self {


GuillaumeGomez · 2024-02-15T00:29:12Z

Looks good to me! Just a nit and it'll be ready to go. :)

…n source order even if early-bound params are present

fmease · 2024-02-15T01:44:10Z

@bors r=GuillaumeGomez rollup

bors · 2024-02-15T01:44:12Z

📌 Commit a8d869e has been approved by GuillaumeGomez

It is now in the queue for this repository.

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#111106 (Add known issue of let binding to format_args doc) - rust-lang#118749 (Make contributing to windows bindings easier) - rust-lang#120982 (Add APIs for fetching foreign items ) - rust-lang#121022 (rustdoc: cross-crate re-exports: correctly render late-bound params in source order even if early-bound params are present) - rust-lang#121082 (Clarified docs on non-atomic oprations on owned/mut refs to atomics) - rust-lang#121084 (Make sure `tcx.create_def` also depends on the forever red node, instead of just `tcx.at(span).create_def`) - rust-lang#121098 (Remove unnecessary else block from `thread_local!` expanded code) - rust-lang#121105 (Do not report overflow errors on ConstArgHasType goals) - rust-lang#121116 (Reinstate some delayed bugs.) - rust-lang#121122 (Enforce coroutine-closure layouts are identical) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#121022 - fmease:rustdoc-x-crate-late-bound-lt-src-order, r=GuillaumeGomez rustdoc: cross-crate re-exports: correctly render late-bound params in source order even if early-bound params are present r? ghost

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 Feb 13, 2024

fmease added A-cross-crate-reexports Area: Documentation that has been re-exported from a different crate and removed A-rustdoc-json Area: Rustdoc JSON backend labels Feb 13, 2024

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 13, 2024

fmease commented Feb 13, 2024

View reviewed changes

src/librustdoc/html/format.rs Outdated Show resolved Hide resolved

fmease commented Feb 13, 2024

View reviewed changes

src/librustdoc/clean/mod.rs Outdated Show resolved Hide resolved

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 13, 2024

fmease force-pushed the rustdoc-x-crate-late-bound-lt-src-order branch from c19c531 to d4a5de3 Compare February 14, 2024 18:22

rustbot added the A-rustdoc-json Area: Rustdoc JSON backend label Feb 14, 2024

fmease removed the A-rustdoc-json Area: Rustdoc JSON backend label Feb 14, 2024

fmease commented Feb 14, 2024

View reviewed changes

fmease marked this pull request as ready for review February 14, 2024 18:24

rustbot assigned GuillaumeGomez Feb 14, 2024

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 14, 2024

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 14, 2024

GuillaumeGomez reviewed Feb 15, 2024

View reviewed changes

rustdoc: cross-crate re-exports: correctly render late-bound params i…

a8d869e

…n source order even if early-bound params are present

fmease force-pushed the rustdoc-x-crate-late-bound-lt-src-order branch from d4a5de3 to a8d869e Compare February 15, 2024 00:40

rustbot added the A-rustdoc-json Area: Rustdoc JSON backend label Feb 15, 2024

fmease removed the A-rustdoc-json Area: Rustdoc JSON backend label Feb 15, 2024

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 15, 2024

matthiaskrgr mentioned this pull request Feb 15, 2024

Rollup of 10 pull requests #121131

Merged

bors merged commit f9a0675 into rust-lang:master Feb 15, 2024
11 checks passed

rustbot added this to the 1.78.0 milestone Feb 15, 2024

fmease deleted the rustdoc-x-crate-late-bound-lt-src-order branch February 15, 2024 15:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rustdoc: cross-crate re-exports: correctly render late-bound params in source order even if early-bound params are present #121022

rustdoc: cross-crate re-exports: correctly render late-bound params in source order even if early-bound params are present #121022

fmease commented Feb 13, 2024

fmease commented Feb 13, 2024

This comment has been minimized.

bors commented Feb 13, 2024

bors commented Feb 13, 2024

This comment has been minimized.

rust-timer commented Feb 13, 2024

fmease commented Feb 14, 2024

fmease Feb 14, 2024 •

edited

Loading

rustbot commented Feb 14, 2024

fmease commented Feb 14, 2024

fmease commented Feb 14, 2024

This comment has been minimized.

bors commented Feb 14, 2024

bors commented Feb 14, 2024

This comment has been minimized.

rust-timer commented Feb 14, 2024

GuillaumeGomez Feb 15, 2024

GuillaumeGomez Feb 15, 2024

GuillaumeGomez commented Feb 15, 2024

fmease commented Feb 15, 2024

bors commented Feb 15, 2024

rustdoc: cross-crate re-exports: correctly render late-bound params in source order even if early-bound params are present #121022

rustdoc: cross-crate re-exports: correctly render late-bound params in source order even if early-bound params are present #121022

Conversation

fmease commented Feb 13, 2024

fmease commented Feb 13, 2024

This comment has been minimized.

bors commented Feb 13, 2024

bors commented Feb 13, 2024

This comment has been minimized.

rust-timer commented Feb 13, 2024

Overall result: ❌ regressions - no action needed

fmease commented Feb 14, 2024

fmease Feb 14, 2024 • edited Loading

Choose a reason for hiding this comment

rustbot commented Feb 14, 2024

fmease commented Feb 14, 2024

fmease commented Feb 14, 2024

This comment has been minimized.

bors commented Feb 14, 2024

bors commented Feb 14, 2024

This comment has been minimized.

rust-timer commented Feb 14, 2024

Overall result: no relevant changes - no action needed

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GuillaumeGomez commented Feb 15, 2024

fmease commented Feb 15, 2024

bors commented Feb 15, 2024

fmease Feb 14, 2024 •

edited

Loading