From cd075630eab578a66afec6000ce0f266e6b281e8 Mon Sep 17 00:00:00 2001
From: René Kijewski <rene.kijewski@fu-berlin.de>
Date: Tue, 1 Aug 2023 03:18:10 +0200
Subject: parser: add type for `Node::Import`

---
 askama_derive/src/generator.rs | 8 ++++----
 askama_derive/src/heritage.rs  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'askama_derive')

diff --git a/askama_derive/src/generator.rs b/askama_derive/src/generator.rs
index 1c6e722..8a2c0e3 100644
--- a/askama_derive/src/generator.rs
+++ b/askama_derive/src/generator.rs
@@ -228,8 +228,8 @@ fn find_used_templates(
                     let source = get_template_source(&extends)?;
                     check.push((extends, source));
                 }
-                Node::Import(_, import, _) => {
-                    let import = input.config.find_template(import, Some(&path))?;
+                Node::Import(import) => {
+                    let import = input.config.find_template(import.path, Some(&path))?;
                     let source = get_template_source(&import)?;
                     check.push((import, source));
                 }
@@ -671,11 +671,11 @@ impl<'a> Generator<'a> {
                     self.visit_lit(lws, val, rws);
                     self.handle_ws(ws2);
                 }
-                Node::Import(ws, _, _) => {
+                Node::Import(ref i) => {
                     if level != AstLevel::Top {
                         return Err("import blocks only allowed at the top level".into());
                     }
-                    self.handle_ws(ws);
+                    self.handle_ws(i.ws);
                 }
                 Node::Extends(_) => {
                     if level != AstLevel::Top {
diff --git a/askama_derive/src/heritage.rs b/askama_derive/src/heritage.rs
index 801b109..9f642e3 100644
--- a/askama_derive/src/heritage.rs
+++ b/askama_derive/src/heritage.rs
@@ -67,11 +67,11 @@ impl Context<'_> {
                     Node::Macro(m) if top => {
                         macros.insert(m.name, m);
                     }
-                    Node::Import(_, import_path, scope) if top => {
-                        let path = config.find_template(import_path, Some(path))?;
-                        imports.insert(*scope, path);
+                    Node::Import(import) if top => {
+                        let path = config.find_template(import.path, Some(path))?;
+                        imports.insert(import.scope, path);
                     }
-                    Node::Extends(_) | Node::Macro(_) | Node::Import(_, _, _) if !top => {
+                    Node::Extends(_) | Node::Macro(_) | Node::Import(_) if !top => {
                         return Err(
                             "extends, macro or import blocks not allowed below top level".into(),
                         );
-- 
cgit