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 to new rinja version (askama) #139321

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update to new rinja version (askama) #139321

wants to merge 3 commits into from
+81 −30

Conversation

GuillaumeGomez
Copy link
Member

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

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

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

Fixed CI! \o/

@flip1995
Copy link
Member

flip1995 commented Apr 4, 2025

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

@notriddle
Copy link
Contributor

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

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

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
Copy link
Member Author

Thanks to both of you!

@bors=notriddle,lolbinarycat rollup

@GuillaumeGomez
Copy link
Member Author

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
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
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@GuillaumeGomez @rustbot @rust-log-analyzer @lolbinarycat @flip1995 @notriddle @yotamofek @bors