diff options
| author |  René Kijewski <rene.kijewski@fu-berlin.de> | 2023-08-01 04:22:52 +0200 |
|---|---|---|
| committer |  Dirkjan Ochtman <dirkjan@ochtman.nl> | 2023-08-01 13:04:41 +0200 |
| commit | 1521a08a20b6631b54d4ecbbbfcb4260e393bc97 (patch) | |
| tree | ed0322763c5cf7fe2f12a2cdc559068bd8a87df3 /askama_derive | |
| parent | 14df8e16c1b2803b23b4bf6eda3bc0e3a5fe5354 (diff) | |
| download | askama-1521a08a20b6631b54d4ecbbbfcb4260e393bc97.tar.gz askama-1521a08a20b6631b54d4ecbbbfcb4260e393bc97.tar.bz2 askama-1521a08a20b6631b54d4ecbbbfcb4260e393bc97.zip | |
parser: add type for `Node::Extends`
Diffstat (limited to '')
| -rw-r--r-- | askama_derive/src/generator.rs | 2 | ||||
| -rw-r--r-- | askama_derive/src/heritage.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/askama_derive/src/generator.rs b/askama_derive/src/generator.rs index 626c7d2..f33829d 100644 --- a/askama_derive/src/generator.rs +++ b/askama_derive/src/generator.rs @@ -214,7 +214,7 @@ fn find_used_templates( for n in parsed.nodes() { match n { Node::Extends(extends) => { - let extends = input.config.find_template(extends, Some(&path))?; + let extends = input.config.find_template(extends.path, Some(&path))?; let dependency_path = (path.clone(), extends.clone()); if dependency_graph.contains(&dependency_path) { return Err(format!( diff --git a/askama_derive/src/heritage.rs b/askama_derive/src/heritage.rs index 1122e39..f09b83e 100644 --- a/askama_derive/src/heritage.rs +++ b/askama_derive/src/heritage.rs @@ -58,10 +58,10 @@ impl Context<'_> { while let Some(nodes) = nested.pop() { for n in nodes { match n { - Node::Extends(extends_path) if top => match extends { + Node::Extends(e) if top => match extends { Some(_) => return Err("multiple extend blocks found".into()), None => { - extends = Some(config.find_template(extends_path, Some(path))?); + extends = Some(config.find_template(e.path, Some(path))?); } }, Node::Macro(m) if top => { |