Render source page layout with Askama by clubby789 · Pull Request #109187 · rust-lang/rust (original) (raw)

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Conversation36 Commits2 Checks0 Files changed

Conversation

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

clubby789

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

r? @GuillaumeGomez

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

@rustbot 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

notriddle

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

GuillaumeGomez

GuillaumeGomez

GuillaumeGomez

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

klensy

@clubby789 @notriddle

Co-authored-by: Michael Howell michael@notriddle.com

@notriddle

@rust-timer

This comment has been minimized.

@bors

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

@bors

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

@rust-timer

This comment has been minimized.

@rust-timer

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

@GuillaumeGomez

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

What do you think @notriddle ?

@clubby789

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

Well, that's definitely worth a try.

@clubby789

@GuillaumeGomez

@rust-timer

This comment has been minimized.

@bors

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

@bors

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

@rust-timer

This comment has been minimized.

@rust-timer

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

@GuillaumeGomez

Seems like the regression was fixed, well done!

@bors r+ rollup

@bors

📌 Commit 4212c1b has been approved by GuillaumeGomez

It is now in the queue for this repository.

@bors 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 added a commit to Dylan-DPC/rust that referenced this pull request

Mar 22, 2023

@Dylan-DPC

…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

bors added a commit to rust-lang-ci/rust that referenced this pull request

Mar 22, 2023

@bors

Labels

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.