Skip to content

Update askama version to 0.15 #150348

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
Merged
bors merged 3 commits into from
Dec 29, 2025
Merged

Update askama version to 0.15 #150348

bors merged 3 commits into from
Dec 29, 2025

Conversation

@GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Dec 24, 2025

New release comes with lots of improvements like improved compile-time. More information here: https://github.com/askama-rs/askama/releases/tag/v0.15.0

r? @yotamofek

@rustbot
Copy link
Collaborator

rustbot commented Dec 24, 2025

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Dec 24, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot rustbot added A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Dec 24, 2025
@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Dec 24, 2025
@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Dec 24, 2025

Hum, considering it changes a few other things... cc @Kobzol

jieyouxu
jieyouxu approved these changes Dec 25, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

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

bootstrap, citool, generate-copyright changes LGTM

View changes since this review

@Kobzol
Copy link
Member

Kobzol commented Dec 25, 2025

Also LGTM regarding those changes.

@bors r=kobzol,jieyouxu

@bors
Copy link
Collaborator

bors commented Dec 25, 2025

📌 Commit 4d69214 has been approved by kobzol,jieyouxu

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 Dec 25, 2025
bors added a commit that referenced this pull request Dec 25, 2025
@bors
Auto merge of #150348 - GuillaumeGomez:update-askama, r=kobzol,jieyouxu
968dce8 
Update askama version to `0.15`

New release comes with lots of improvements like improved compile-time. More information here: https://github.com/askama-rs/askama/releases/tag/v0.15.0

r? `@yotamofek`
@bors
Copy link
Collaborator

bors commented Dec 25, 2025

⌛ Testing commit 4d69214 with merge 968dce8...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented Dec 25, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 25, 2025
@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Dec 25, 2025

Interesting, we generate docs in the askama proc-macro which contains a bad intra-doc link. Gonna fix that upstream and add a regression test for it.

@GuillaumeGomez GuillaumeGomez mentioned this pull request Dec 25, 2025
Merged
@rustbot
Copy link
Collaborator

rustbot commented Dec 28, 2025

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Dec 28, 2025

@bors try jobs=dist-x86_64-linux-alt

@rust-bors

This comment has been minimized.

Sign in to view
rust-bors bot added a commit that referenced this pull request Dec 28, 2025
@rust-bors
Auto merge of #150348 - GuillaumeGomez:update-askama, r=<try>
6782e73 
Update askama version to `0.15`

try-job: dist-x86_64-linux-alt
@rust-bors
Copy link
Contributor

rust-bors bot commented Dec 28, 2025

☀️ Try build successful (CI)
Build commit: 6782e73 (6782e7334e5b43d20e08cf9899f4196ddc213bba, parent: 9f54abeebae58244d0d1c692af6f37d2b521e136)

@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Dec 29, 2025

Seems like it's fixed.

@bors r=kobzol,jieyouxu

@bors
Copy link
Collaborator

bors commented Dec 29, 2025

📌 Commit 4559268 has been approved by kobzol,jieyouxu

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 Dec 29, 2025
@bors
Copy link
Collaborator

bors commented Dec 29, 2025

⌛ Testing commit 4559268 with merge 112a274...

@bors
Copy link
Collaborator

bors commented Dec 29, 2025

☀️ Test successful - checks-actions
Approved by: kobzol,jieyouxu
Pushing 112a274 to main...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 29, 2025
@bors bors merged commit 112a274 into rust-lang:main Dec 29, 2025
13 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Dec 29, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Dec 29, 2025

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 123588a (parent) -> 112a274 (this PR)

Test differences

Show 3 test diffs

3 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 112a274275d77ebc2b892f056a1e2fad141f4f08 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-aarch64-apple: 7172.9s -> 8793.4s (+22.6%)
  2. dist-apple-various: 4260.9s -> 3331.7s (-21.8%)
  3. dist-x86_64-apple: 8450.3s -> 6668.3s (-21.1%)
  4. x86_64-rust-for-linux: 3131.8s -> 2510.7s (-19.8%)
  5. pr-check-1: 1984.6s -> 1676.9s (-15.5%)
  6. x86_64-gnu-llvm-20: 4987.0s -> 4380.5s (-12.2%)
  7. x86_64-gnu-nopt: 8125.3s -> 9084.4s (+11.8%)
  8. x86_64-gnu-tools: 3657.7s -> 3285.2s (-10.2%)
  9. test-various: 7456.8s -> 6739.4s (-9.6%)
  10. x86_64-gnu-llvm-21-1: 4626.6s -> 4219.8s (-8.8%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

rust-timer commented Dec 29, 2025

Finished benchmarking commit (112a274): comparison URL.

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

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

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

Max RSS (memory usage)

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

Cycles

Results (secondary -2.4%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

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

Binary size

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

Bootstrap: 483.839s -> 485.523s (0.35%)
Artifact size: 390.87 MiB -> 390.82 MiB (-0.01%)

@bors bors mentioned this pull request Dec 29, 2025
Draft
@GuillaumeGomez GuillaumeGomez deleted the update-askama branch December 29, 2025 13:46
@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Dec 29, 2025

Seems like noise since doc seem to only see performance or nothing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@yotamofek yotamofek

Labels

A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Milestone

1.94.0

Development

Successfully merging this pull request may close these issues.

8 participants

@GuillaumeGomez @rustbot @rust-log-analyzer @Kobzol @bors @rust-timer @jieyouxu @yotamofek