chore: bump minijinja from 0.31.0 to 2.0.1 (#4429)

Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Maximilian Roos <[email protected]>
PRQL · Apr 29, 2024 · d623066 · d623066
1 parent 28e4206
commit d623066
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/prqlc/prqlc/Cargo.toml b/prqlc/prqlc/Cargo.toml
@@ -76,7 +76,7 @@ clap_complete = {version = "4.4.9", optional = true}
 
 # We use minijinja just for the Jinja lexer, which is not part of the
 # public interface which is covered by semver guarantees.
-minijinja = {version = "=0.31.0", features = ["unstable_machinery"], optional = true}
+minijinja = {version = "=2.0.1", features = ["unstable_machinery"], optional = true}
 
 # For integration tests. These are gated by the `test-dbs` and `test-dbs-external` features,
 # rather than dev-dependencies, because dev-dependencies can't be optional.

diff --git a/prqlc/prqlc/src/cli/jinja.rs b/prqlc/prqlc/src/cli/jinja.rs
@@ -18,7 +18,10 @@
 use std::collections::HashMap;
 
 use anyhow::Result;
-use minijinja::machinery::{Span, Token};
+use minijinja::{
+    machinery::{Span, Token, WhitespaceConfig},
+    syntax::SyntaxConfig,
+};
 use regex::Regex;
 
 const ANCHOR_PREFIX: &str = "_jinja_";
@@ -41,7 +44,9 @@ pub fn pre_process(source: &str) -> Result<(String, JinjaContext)> {
     let mut blocks = Vec::new();
     let mut current_block = Vec::new();
 
-    for res in minijinja::machinery::tokenize(source, false) {
+    for res in
+        minijinja::machinery::tokenize(source, false, SyntaxConfig, WhitespaceConfig::default())
+    {
         let (token, span) = res?;
 
         if let Token::TemplateData(data) = token {
@@ -159,14 +164,18 @@ mod test {
                     Span {
                         start_line: 2,
                         start_col: 9,
+                        start_offset: 0,
                         end_line: 12_123_123,
                         end_col: 2_930_293,
+                        end_offset: 0
                     },
                     Span {
                         start_line: 7_893_648,
                         start_col: 79678,
+                        start_offset: 0,
                         end_line: 3,
                         end_col: 31,
+                        end_offset: 0
                     }
                 ]
             ),