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

Replace tera with rinja #2292

Merged
merged 6 commits into from
Jul 16, 2024
Merged

Replace tera with rinja #2292

merged 6 commits into from
Jul 16, 2024

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Oct 23, 2023 •
edited
Loading

No description provided.

@github-actions github-actions bot added the S-waiting-on-review Status: This pull request has been implemented and needs to be reviewed label Oct 23, 2023
@syphar syphar removed the S-waiting-on-review Status: This pull request has been implemented and needs to be reviewed label Nov 5, 2023
@syphar syphar mentioned this pull request Nov 8, 2023
Merged
@GuillaumeGomez GuillaumeGomez force-pushed the switch-to-askama branch 2 times, most recently from 524bb91 to 83153d1 Compare December 6, 2023 15:33
@GuillaumeGomez GuillaumeGomez force-pushed the switch-to-askama branch 2 times, most recently from a92b9ce to 3754294 Compare March 11, 2024 20:08
@GuillaumeGomez GuillaumeGomez force-pushed the switch-to-askama branch 2 times, most recently from ef5f330 to 6e7fa52 Compare April 23, 2024 15:39
@GuillaumeGomez GuillaumeGomez force-pushed the switch-to-askama branch 4 times, most recently from 64ee87b to 6dfab34 Compare July 4, 2024 13:11
@GuillaumeGomez GuillaumeGomez changed the title Replace tera with askama Replace tera with rinja Jul 4, 2024
@GuillaumeGomez GuillaumeGomez force-pushed the switch-to-askama branch 10 times, most recently from c4bc7e0 to ff78a04 Compare July 8, 2024 18:04
@GuillaumeGomez GuillaumeGomez reopened this Jul 8, 2024
@GuillaumeGomez GuillaumeGomez marked this pull request as ready for review July 8, 2024 18:15
@GuillaumeGomez
Copy link
Member Author

Fixed the fix for JS mime types.

@GuillaumeGomez
Copy link
Member Author

CI passed. \o/

syphar
syphar requested changes Jul 12, 2024
View reviewed changes
Copy link
Member

@syphar syphar left a comment

Choose a reason for hiding this comment

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

one remaining issue

src/web/rustdoc.rs Show resolved Hide resolved
templates/core/about/metadata.html Outdated Show resolved Hide resolved
@syphar syphar added S-waiting-on-author Status: This PR is incomplete or needs to address review comments and removed S-waiting-on-review Status: This pull request has been implemented and needs to be reviewed labels Jul 12, 2024
@GuillaumeGomez
Copy link
Member Author

This issue allowed me to uncover a bug in rinja. PR for fix is open here.

@GuillaumeGomez
Copy link
Member Author

Fixed the bug. Should be ready now.

@GuillaumeGomez
Copy link
Member Author

Forgot to add a |safe once again. Fixed too.

syphar
syphar approved these changes Jul 16, 2024
View reviewed changes
Copy link
Member

@syphar syphar left a comment

Choose a reason for hiding this comment

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

I can't find anything else, so I would propose we go for it.

We probably will find some edge cases in production, but I feel safer with compile time checked templates.

Can you release rinja and change the dependency?

Also you can do any rebasing, if you wanted to do any.

This was referenced Jul 16, 2024
Merged
Closed
@GuillaumeGomez
Copy link
Member Author

Normally it should already be rebased. Gonna make a release today hopefully.

@GuillaumeGomez
Copy link
Member Author

Released rinja, rebased this branch on top of master. I'll merge once CI is green then.

@GuillaumeGomez GuillaumeGomez merged commit afde17b into rust-lang:master Jul 16, 2024
8 checks passed
@GuillaumeGomez GuillaumeGomez deleted the switch-to-askama branch July 16, 2024 12:18
@github-actions github-actions bot added S-waiting-on-deploy This PR is ready to be merged, but is waiting for an admin to have time to deploy it and removed S-waiting-on-author Status: This PR is incomplete or needs to address review comments labels Jul 16, 2024
@syphar syphar removed the S-waiting-on-deploy This PR is ready to be merged, but is waiting for an admin to have time to deploy it label Jul 31, 2024
Turbo87
Turbo87 reviewed Sep 5, 2024
View reviewed changes
templates/rustdoc/topbar.html
</a>
</li>
{%- endif -%}

<li class="pure-menu-item">
<a href="https://crates.io/crates/{{ krate.name }}" class="pure-menu-link" title="See {{ krate.name }} in crates.io">
{{ "cube" | fas }} crates.io
{{ "cube"|fas(false, false, "")|safe }} Crates.io
Copy link
Member

Choose a reason for hiding this comment

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

@GuillaumeGomez was there a reason for reverting this back to capitalized? (see #2508)

Copy link
Member Author

Choose a reason for hiding this comment

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

No, mistake on my end. Gonna send a PR to fix it.

@GuillaumeGomez GuillaumeGomez mentioned this pull request Sep 5, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Turbo87 Turbo87 Turbo87 left review comments

@syphar syphar syphar approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@GuillaumeGomez @Turbo87 @syphar