Skip to content
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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

rustdoc: Migrate document_item_info to Askama #108757

Merged
merged 1 commit into from
Mar 11, 2023
Merged

rustdoc: Migrate document_item_info to Askama #108757

merged 1 commit into from
Mar 11, 2023

Conversation

clubby789
Copy link
Contributor

https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/rustdoc.20allocations.20are.20slow

Hoping to piece-by-piece migrate things to template. Had a few failed attempts at more complex parts of the code, so this is just a start.

@rustbot
Copy link
Collaborator

rustbot commented Mar 5, 2023

r? @notriddle

(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 5, 2023
@clubby789
Copy link
Contributor Author

clubby789 commented Mar 5, 2023 •
edited
Loading

@rustbot ready

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 5, 2023
@rustbot 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 5, 2023
@clubby789 clubby789 mentioned this pull request Mar 5, 2023
Merged
@notriddle
Copy link
Contributor

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 5, 2023
@bors
Copy link
Contributor

bors commented Mar 5, 2023

⌛ Trying commit 74e2dedc9cb6057480c2e5f27291d0ec6e9277f7 with merge e9aed1bbf98490280c3356d543e24e8882d9448d...

@bors
Copy link
Contributor

bors commented Mar 5, 2023

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

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e9aed1bbf98490280c3356d543e24e8882d9448d): comparison URL.

Overall result: ❌ regressions - 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.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@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.3%, 1.1%] 3
Regressions ❌
(secondary)		 2.3% [2.0%, 2.6%] 6
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.8% [0.3%, 1.1%] 3

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

Cycles

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

@rustbot rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Mar 6, 2023
@notriddle
Copy link
Contributor

Most of those aren't even doc instruction counts, so it's noise.

@Noratrieb Noratrieb added the perf-regression-triaged The performance regression has been triaged. label Mar 6, 2023
@clubby789 clubby789 mentioned this pull request Mar 7, 2023
Open
25 tasks
jsha
jsha requested changes Mar 8, 2023
View reviewed changes
Copy link
Contributor

@jsha jsha left a comment

Choose a reason for hiding this comment

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

This looks really nice.

src/librustdoc/html/templates/item_info.html Outdated Show resolved Hide resolved
src/librustdoc/html/render/mod.rs Outdated Show resolved Hide resolved
@notriddle notriddle 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 9, 2023
@clubby789
Copy link
Contributor Author

@rustbot ready

@bors
Copy link
Contributor

bors commented Mar 10, 2023

📌 Commit e8dabcf9752281a6c4de96cbd91d580ff9b1399d has been approved by notriddle,jsha

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 10, 2023
@GuillaumeGomez
Copy link
Member

@bors r-

Sorry, since #108805 was merged, a few small changes need to be done in here (adding comments).

@bors 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 10, 2023
@GuillaumeGomez
Copy link
Member

Thanks!

@bors r=notriddle,jsha,GuillaumeGomez rollup

@bors
Copy link
Contributor

bors commented Mar 10, 2023

📌 Commit bb37b60 has been approved by notriddle,jsha,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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 10, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 11, 2023
@matthiaskrgr
Rollup merge of rust-lang#108757 - clubby789:askama-move, r=notriddle…
366a3ee 
…,jsha,GuillaumeGomez

rustdoc: Migrate `document_item_info` to Askama

https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/rustdoc.20allocations.20are.20slow

Hoping to piece-by-piece migrate things to template. Had a few failed attempts at more complex parts of the code, so this is just a start.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 11, 2023
@matthiaskrgr
Rollup merge of rust-lang#108784 - clubby789:askama-sidebar, r=jsha,G…
7be58e7 
…uillaumeGomez

rustdoc: Migrate sidebar rendering to Askama

cc rust-lang#108757

Renders the sidebar for documentation using an Askama template
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 11, 2023
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 11, 2023
@matthiaskrgr
Rollup merge of rust-lang#108784 - clubby789:askama-sidebar, r=jsha,G…
2579419 
…uillaumeGomez

rustdoc: Migrate sidebar rendering to Askama

cc rust-lang#108757

Renders the sidebar for documentation using an Askama template
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 11, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 11, 2023
@bors
Auto merge of rust-lang#109015 - matthiaskrgr:rollup-xu2s31g, r=matth…
67e1681 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#106276 (Fix `vec_deque::Drain` FIXME)
 - rust-lang#107629 (rustdoc: sort deprecated items lower in search)
 - rust-lang#108711 (Add note when matching token with nonterminal)
 - rust-lang#108757 (rustdoc: Migrate `document_item_info` to Askama)
 - rust-lang#108784 (rustdoc: Migrate sidebar rendering to Askama)
 - rust-lang#108927 (Move __thread_local_inner to sys)
 - rust-lang#108949 (Honor current target when checking conditional compilation values)
 - rust-lang#108950 (Directly construct Inherited in typeck.)
 - rust-lang#108988 (rustdoc: Don't crash on `crate` references in blocks)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 949c553 into rust-lang:master Mar 11, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsha jsha jsha requested changes

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

Labels
perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. 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.
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
8 participants
@clubby789 @rustbot @notriddle @rust-timer @bors @GuillaumeGomez @jsha @Noratrieb