Skip to content

Update to new rinja version (askama)#139321

Merged
bors merged 3 commits intorust-lang:masterfrom
GuillaumeGomez:update-rinja
Apr 8, 2025
Merged

Update to new rinja version (askama)#139321
bors merged 3 commits intorust-lang:masterfrom
GuillaumeGomez:update-rinja

Conversation

@GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Apr 3, 2025

Askama maintenance was handed over to rinja maintainers so new rinja release is actually askama. More information here.

r? @notriddle

@GuillaumeGomez GuillaumeGomez marked this pull request as ready for review April 3, 2025 13:39
@rustbot
Copy link
Collaborator

rustbot commented Apr 3, 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 Apr 3, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Apr 3, 2025
@lolbinarycat
Copy link
Contributor

lolbinarycat commented Apr 3, 2025

I noticed that the rinja entry wasn't removed from Cargo.lock so I did some grepping around, and found 2 dependents besides rustdoc:

  • clippy (understandable that it would be updated separately, since its a submodule)
  • src/tools/generate-copyright, which should probably also be migrated

@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Apr 4, 2025

For clippy it's already done in rust-lang/rust-clippy#14530. However very good catch for generate-copyright! Gonna update it right away.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Apr 4, 2025

Fixed CI! \o/

@flip1995
Copy link
Member

flip1995 commented Apr 4, 2025

Bump: This is currently blocking the Clippy sync: #139337

yotamofek
yotamofek reviewed Apr 4, 2025
View reviewed changes
yotamofek
yotamofek reviewed Apr 4, 2025
View reviewed changes
@notriddle
Copy link
Contributor

notriddle commented Apr 4, 2025

Could you upgrade askama to the latest version of syn? It seems to be using a very old one right now.

@yotamofek
Copy link
Contributor

yotamofek commented Apr 5, 2025

Could you upgrade askama to the latest version of syn? It seems to be using a very old one right now.

Actually, it's not. For whatever reason, this PR is also pulling in an old version of askama that is dependent on the older syn. Probably just needs a cargo update -p askama on this PR!

@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Apr 5, 2025

There was an askama 0.3 version still used so fixed it.

notriddle
notriddle reviewed Apr 5, 2025
View reviewed changes
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Apr 6, 2025

Thanks to both of you!

@bors=notriddle,lolbinarycat rollup

@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Apr 7, 2025

Wrong command...

@bors r=notriddle,lolbinarycat,yotamofek rollup

@bors
Copy link
Collaborator

bors commented Apr 7, 2025

📌 Commit d37bd4d has been approved by notriddle,lolbinarycat,yotamofek

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 Apr 7, 2025
Zalathar added a commit to Zalathar/rust that referenced this pull request Apr 8, 2025
@Zalathar
Rollup merge of rust-lang#139321 - GuillaumeGomez:update-rinja, r=not…
a5e7f0e 
…riddle,lolbinarycat,yotamofek

Update to new rinja version (askama)

Askama maintenance was handed over to rinja maintainers so new `rinja` release is actually `askama`. More information [here](https://blog.guillaume-gomez.fr/articles/2025-03-19+Askama+and+Rinja+merge).

r? `@notriddle`
@Zalathar Zalathar mentioned this pull request Apr 8, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 8, 2025
@bors
Auto merge of rust-lang#139508 - Zalathar:rollup-ldbvvyf, r=compiler-…
959c2bf 
…errors

Rollup of 19 pull requests

Successful merges:

 - rust-lang#138676 (Implement overflow for infinite implied lifetime bounds)
 - rust-lang#139024 (Make error message for missing fields with `..` and without `..` more consistent)
 - rust-lang#139098 (Tell LLVM about impossible niche tags)
 - rust-lang#139124 (compiler: report error when trait object type param reference self)
 - rust-lang#139321 (Update to new rinja version (askama))
 - rust-lang#139346 (Don't construct preds w escaping bound vars in `diagnostic_hir_wf_check`)
 - rust-lang#139386 (make it possible to use stage0 libtest on compiletest)
 - rust-lang#139421 (Fix trait upcasting to dyn type with no principal when there are projections)
 - rust-lang#139468 (Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic`)
 - rust-lang#139476 (rm `RegionInferenceContext::var_infos`)
 - rust-lang#139481 (Add job summary links to post-merge report)
 - rust-lang#139485 (compiletest: Stricter parsing for diagnostic kinds)
 - rust-lang#139490 (Update some comment/docs related to "extern intrinsic" removal)
 - rust-lang#139491 (Update books)
 - rust-lang#139496 (Revert r-a changes of rust-lang#139455)
 - rust-lang#139500 (document panic behavior of Vec::resize and Vec::resize_with)
 - rust-lang#139501 (Fix stack overflow in exhaustiveness due to recursive HIR opaque hidden types)
 - rust-lang#139504 (add missing word in doc comment)
 - rust-lang#139507 (compiletest: Trim whitespace from environment variable names)

r? `@ghost`
`@rustbot` modify labels: rollup
@Zalathar Zalathar mentioned this pull request Apr 8, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 8, 2025
@bors
Auto merge of rust-lang#139525 - Zalathar:rollup-5t5xsrw, r=Zalathar
f820b75 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#138676 (Implement overflow for infinite implied lifetime bounds)
 - rust-lang#139024 (Make error message for missing fields with `..` and without `..` more consistent)
 - rust-lang#139098 (Tell LLVM about impossible niche tags)
 - rust-lang#139124 (compiler: report error when trait object type param reference self)
 - rust-lang#139321 (Update to new rinja version (askama))
 - rust-lang#139346 (Don't construct preds w escaping bound vars in `diagnostic_hir_wf_check`)
 - rust-lang#139386 (make it possible to use stage0 libtest on compiletest)
 - rust-lang#139421 (Fix trait upcasting to dyn type with no principal when there are projections)
 - rust-lang#139464 (Allow for reparsing failure when reparsing a pasted metavar.)
 - rust-lang#139490 (Update some comment/docs related to "extern intrinsic" removal)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit dd682f7 into rust-lang:master Apr 8, 2025
6 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 8, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 8, 2025
@rust-timer
Unrolled build for rust-lang#139321
85f829c 
Rollup merge of rust-lang#139321 - GuillaumeGomez:update-rinja, r=notriddle,lolbinarycat,yotamofek

Update to new rinja version (askama)

Askama maintenance was handed over to rinja maintainers so new `rinja` release is actually `askama`. More information [here](https://blog.guillaume-gomez.fr/articles/2025-03-19+Askama+and+Rinja+merge).

r? ``@notriddle``
@GuillaumeGomez GuillaumeGomez deleted the update-rinja branch April 8, 2025 17:52
@dtolnay dtolnay mentioned this pull request Aug 20, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yotamofek yotamofek yotamofek left review comments

@notriddle notriddle notriddle approved these changes

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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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.88.0

Development

Successfully merging this pull request may close these issues.

8 participants

@GuillaumeGomez @rustbot @rust-log-analyzer @lolbinarycat @flip1995 @notriddle @yotamofek @bors