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

Update askama to 0.12 and improve whitespace control #108805

Merged
merged 3 commits into from
Mar 7, 2023
Merged

Update askama to 0.12 and improve whitespace control #108805

merged 3 commits into from
Mar 7, 2023

Conversation

GuillaumeGomez
Copy link
Member

askama 0.12 was just released, and it adds the possibility to have "whitespace suppression" enabled by default in the configuration so I switched to it.

r? @notriddle

@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 6, 2023
@rustbot
Copy link
Collaborator

rustbot commented Mar 6, 2023

These commits modify the Cargo.lock file. Random changes to Cargo.lock can be introduced when switching branches and rebasing PRs.
This was probably unintentional and should be reverted before this PR is merged.

If this was intentional then you can ignore this comment.

@GuillaumeGomez
Copy link
Member Author

I don't think it'll impact the performance but just in case...

@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 6, 2023
@bors
Copy link
Contributor

bors commented Mar 6, 2023

⌛ Trying commit 511d262 with merge 0b20201da7514d93a292d5ffad7259b5173fda49...

@bors
Copy link
Contributor

bors commented Mar 6, 2023

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

1 similar comment
@bors
Copy link
Contributor

bors commented Mar 6, 2023

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

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (0b20201da7514d93a292d5ffad7259b5173fda49): 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

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

Cycles

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

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 6, 2023
@notriddle
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 6, 2023

📌 Commit 511d262 has been approved by notriddle

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 6, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 7, 2023
@matthiaskrgr
Rollup merge of rust-lang#108805 - GuillaumeGomez:update-askama, r=no…
54e9b97 
…triddle

Update askama to 0.12 and improve whitespace control

`askama` 0.12 was just released, and it adds the possibility to have "whitespace suppression" enabled by default in the configuration so I switched to it.

r? `@notriddle`
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 7, 2023
Closed
@JohnTitor JohnTitor mentioned this pull request Mar 7, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 7, 2023
@bors
Auto merge of rust-lang#108863 - JohnTitor:rollup-haydnsw, r=JohnTitor
1a521db 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#108619 (Remove the option to disable `llvm-version-check`)
 - rust-lang#108728 (infer: fix and improve comments)
 - rust-lang#108731 (feat: impl better help for `.poll()` not found on `impl Future`)
 - rust-lang#108774 (Greatly improve the error messages when `run-make/translation` fails)
 - rust-lang#108805 (Update askama to 0.12 and improve whitespace control)
 - rust-lang#108823 (Add tracking issue for cf-protection to unstable book)
 - rust-lang#108855 (Custom MIR: Support `as` casts)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 79fd51d into rust-lang:master Mar 7, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 7, 2023
@GuillaumeGomez GuillaumeGomez deleted the update-askama branch March 7, 2023 18:26
@GuillaumeGomez GuillaumeGomez mentioned this pull request Mar 10, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@notriddle notriddle

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.
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
5 participants
@GuillaumeGomez @rustbot @rust-timer @bors @notriddle