Render source page layout with Askama #109187

clubby789 · 2023-03-15T19:42:22Z

~~I was looking at making code_html render into the buffer instead of in advance, but it turned out to need a pretty big refactor, so starting with rearranging the high-level layout.~~
Found another approach which required much less changes

cc #108868

rustbot · 2023-03-15T19:42:27Z

r? @GuillaumeGomez

(rustbot has picked a reviewer for you, use r? to override)

notriddle

Please do not silently discard errors without a comment explaining why.

src/librustdoc/html/templates/source.html

src/librustdoc/html/highlight.rs

src/librustdoc/html/templates/source.html

GuillaumeGomez

Other than my 2 comments, looks good to me. 👍

src/librustdoc/html/templates/source.html

Co-authored-by: Michael Howell <[email protected]>

notriddle · 2023-03-16T18:48:54Z

@bors try @rust-timer queue

bors · 2023-03-16T18:49:04Z

⌛ Trying commit 102c8fa with merge 169efdfd0f10bb24ab80a18cc508cdfc62cd489c...

bors · 2023-03-16T21:33:46Z

☀️ Try build successful - checks-actions
Build commit: 169efdfd0f10bb24ab80a18cc508cdfc62cd489c (169efdfd0f10bb24ab80a18cc508cdfc62cd489c)

rust-timer · 2023-03-18T03:02:22Z

Finished benchmarking commit (169efdfd0f10bb24ab80a18cc508cdfc62cd489c): 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.8%	[0.8%, 0.8%]	1
Regressions ❌ (secondary)	1.1%	[0.5%, 2.0%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.8%	[0.8%, 0.8%]	1

Max RSS (memory usage)

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.9%	[0.7%, 1.1%]	4
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.5%	[-0.5%, -0.5%]	1
Improvements ✅ (secondary)	-2.2%	[-3.1%, -1.2%]	2
All ❌✅ (primary)	0.6%	[-0.5%, 1.1%]	5

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.5%	[0.4%, 0.5%]	2
Regressions ❌ (secondary)	5.2%	[4.6%, 6.1%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.5%	[0.4%, 0.5%]	2

GuillaumeGomez · 2023-03-21T11:55:48Z

We have some small regressions but the code improvement is worth it I think.

What do you think @notriddle ?

clubby789 · 2023-03-21T14:41:22Z

I wonder if it might be worth adding safe to the line numbers? I didn't add it because it looked a bit noisy but it might be the source of the regression

GuillaumeGomez · 2023-03-21T14:42:43Z

Well, that's definitely worth a try.

GuillaumeGomez · 2023-03-21T18:13:19Z

@bors try @rust-timer queue

bors · 2023-03-21T18:13:30Z

⌛ Trying commit 4212c1b with merge 2091bf6dc062c75fd04a804f89148a395fc1c98a...

bors · 2023-03-21T20:08:09Z

☀️ Try build successful - checks-actions
Build commit: 2091bf6dc062c75fd04a804f89148a395fc1c98a (2091bf6dc062c75fd04a804f89148a395fc1c98a)

rust-timer · 2023-03-21T21:53:56Z

Finished benchmarking commit (2091bf6dc062c75fd04a804f89148a395fc1c98a): comparison URL.

Overall result: ❌✅ regressions and improvements - 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)	0.6%	[0.6%, 0.6%]	1
Improvements ✅ (primary)	-0.5%	[-0.5%, -0.5%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.5%	[-0.5%, -0.5%]	1

Max RSS (memory usage)

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)	1.9%	[1.9%, 1.9%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.6%	[-0.9%, -0.5%]	4
Improvements ✅ (secondary)	-3.1%	[-4.3%, -1.9%]	2
All ❌✅ (primary)	-0.1%	[-0.9%, 1.9%]	5

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)	-	-	0
Improvements ✅ (primary)	-0.7%	[-0.9%, -0.5%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.7%	[-0.9%, -0.5%]	2

GuillaumeGomez · 2023-03-22T09:41:33Z

Seems like the regression was fixed, well done!

@bors r+ rollup

bors · 2023-03-22T09:41:35Z

📌 Commit 4212c1b has been approved by GuillaumeGomez

It is now in the queue for this repository.

…meGomez Render source page layout with Askama ~~I was looking at making `code_html` render into the buffer instead of in advance, but it turned out to need a pretty big refactor, so starting with rearranging the high-level layout.~~ Found another approach which required much less changes cc rust-lang#108868

Rollup of 11 pull requests Successful merges: - rust-lang#100311 (Fix handling of trailing bare CR in str::lines) - rust-lang#108997 (Change text -> rust highlighting in sanitizer.md) - rust-lang#109179 (move Option::as_slice to intrinsic) - rust-lang#109187 (Render source page layout with Askama) - rust-lang#109280 (Remove `VecMap`) - rust-lang#109295 (refactor `fn bootstrap::builder::Builder::compiler_for` logic) - rust-lang#109312 (rustdoc: Cleanup parent module tracking for doc links) - rust-lang#109317 (Update links for custom discriminants.) - rust-lang#109405 (RPITITs are `DefKind::Opaque` with new lowering strategy) - rust-lang#109414 (Do not consider synthesized RPITITs on missing items checks) - rust-lang#109435 (Detect uninhabited types early in const eval) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned GuillaumeGomez Mar 15, 2023

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 Mar 15, 2023

clubby789 force-pushed the askama-source branch from 0598b5f to 232223e Compare March 15, 2023 20:25

notriddle requested changes Mar 15, 2023

View reviewed changes

GuillaumeGomez reviewed Mar 16, 2023

View reviewed changes

src/librustdoc/html/templates/source.html Outdated Show resolved Hide resolved

GuillaumeGomez reviewed Mar 16, 2023

View reviewed changes

src/librustdoc/html/templates/source.html Outdated Show resolved Hide resolved

GuillaumeGomez reviewed Mar 16, 2023

View reviewed changes

klensy reviewed Mar 16, 2023

View reviewed changes

src/librustdoc/html/templates/source.html Show resolved Hide resolved

Render source page layout with Askama

102c8fa

Co-authored-by: Michael Howell <[email protected]>

clubby789 force-pushed the askama-source branch from bd97173 to 102c8fa Compare March 16, 2023 14:34

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 Mar 16, 2023

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 Mar 18, 2023

GuillaumeGomez approved these changes Mar 21, 2023

View reviewed changes

Add safe to number rendering

4212c1b

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 Mar 21, 2023

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 Mar 21, 2023

GuillaumeGomez approved these changes Mar 22, 2023

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 Mar 22, 2023

Dylan-DPC mentioned this pull request Mar 22, 2023

Rollup of 12 pull requests #109490

Closed

Dylan-DPC mentioned this pull request Mar 22, 2023

Rollup of 11 pull requests #109496

Merged

bors merged commit d8543ab into rust-lang:master Mar 22, 2023

rustbot added this to the 1.70.0 milestone Mar 22, 2023

clubby789 mentioned this pull request Mar 26, 2023

Tracking Issue for Rustdoc Askama Migration #108868

Open

25 tasks

nicklimmm mentioned this pull request Jun 17, 2023

rustdoc: migrate item_struct to an Askama template #111430

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Render source page layout with Askama #109187

Render source page layout with Askama #109187

clubby789 commented Mar 15, 2023 •

edited

Loading

rustbot commented Mar 15, 2023

notriddle left a comment

GuillaumeGomez left a comment

notriddle commented Mar 16, 2023

This comment has been minimized.

bors commented Mar 16, 2023

bors commented Mar 16, 2023

This comment has been minimized.

rust-timer commented Mar 18, 2023

GuillaumeGomez commented Mar 21, 2023

clubby789 commented Mar 21, 2023

GuillaumeGomez commented Mar 21, 2023

GuillaumeGomez commented Mar 21, 2023

This comment has been minimized.

bors commented Mar 21, 2023

bors commented Mar 21, 2023

This comment has been minimized.

rust-timer commented Mar 21, 2023

GuillaumeGomez commented Mar 22, 2023

bors commented Mar 22, 2023

Render source page layout with Askama #109187

Render source page layout with Askama #109187

Conversation

clubby789 commented Mar 15, 2023 • edited Loading

rustbot commented Mar 15, 2023

notriddle left a comment

Choose a reason for hiding this comment

GuillaumeGomez left a comment

Choose a reason for hiding this comment

notriddle commented Mar 16, 2023

This comment has been minimized.

bors commented Mar 16, 2023

bors commented Mar 16, 2023

This comment has been minimized.

rust-timer commented Mar 18, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

GuillaumeGomez commented Mar 21, 2023

clubby789 commented Mar 21, 2023

GuillaumeGomez commented Mar 21, 2023

GuillaumeGomez commented Mar 21, 2023

This comment has been minimized.

bors commented Mar 21, 2023

bors commented Mar 21, 2023

This comment has been minimized.

rust-timer commented Mar 21, 2023

Overall result: ❌✅ regressions and improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

GuillaumeGomez commented Mar 22, 2023

bors commented Mar 22, 2023

clubby789 commented Mar 15, 2023 •

edited

Loading