Repository navigation
chore: bump minijinja from 2.24.0 to 3.0.0 - #6437
dependabot[bot] wants to merge 2 commits into
Conversation
Bumps [minijinja](https://github.com/mitsuhiko/minijinja) from 2.24.0 to 3.0.0. - [Release notes](https://github.com/mitsuhiko/minijinja/releases) - [Changelog](https://github.com/mitsuhiko/minijinja/blob/main/CHANGELOG.md) - [Commits](mitsuhiko/minijinja@minijinja-go/v2.24.0...minijinja-go/v3.0.0) --- updated-dependencies: - dependency-name: minijinja dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
prql-bot
left a comment
There was a problem hiding this comment.
minijinja 3 breaks the build of prqlc/prqlc/src/cli/jinja.rs (the cli feature's only use of the crate): WhitespaceConfig was removed from unstable_machinery, SyntaxConfig is no longer a unit struct, and machinery::tokenize now takes three arguments. Building this head fails with E0432 unresolved import minijinja::machinery::WhitespaceConfig, E0423 expected value, found struct SyntaxConfig and E0061 this function takes 3 arguments but 4 arguments were supplied.
The fix is to call tokenize(source, false, SyntaxConfig::default()) and drop the import. In 3.0, SyntaxConfig::default() embeds WhitespaceConfig::default(), so tokenization is unchanged. With that change, the cli::jinja tests pass and cargo clippy -p prqlc --all-targets -D warnings is clean. I'll push it to this branch as a follow-up commit. minijinja 3's rust-version is 1.70, below the workspace's 1.85, so the MSRV doesn't move.
Bumps minijinja from 2.24.0 to 3.0.0.
Changelog
Sourced from minijinja's changelog.
... (truncated)
Commits
c1e7e23chore(release): 3.0.07a8f76bdocs(changelog): consolidate the 3.0.0 alpha entriesc123ab4docs: complete the MiniJinja 3 upgrade guide7a92676feat(playground): add an empty example1be8515feat(playground): add a console tab for logged messages85e5206fix(playground): replace empty configs with the default configde65258feat(playground): use commented out examples as default config2d95b1ffeat(playground): add config tab and preview mode toggle2e76f5efeat(playground): align colors with the MiniJinja logo3982db0fix(ci): exclude minijinja-js from MSRV buildsMost Recent Ignore Conditions Applied to This Pull Request
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)