From 1b1ab5e1b94c136d3cd057f8214623a40e707e5f Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Mon, 18 Dec 2023 11:51:37 +0100 Subject: Unbreak reading config from default location I broke this in 2a4d58cbb2033114890415c98a61e730185d1f83 due to refactoring for better internal abstractions in askama_derive. We also don't currently have any tests for the default config path. --- askama_derive/src/input.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'askama_derive/src/input.rs') diff --git a/askama_derive/src/input.rs b/askama_derive/src/input.rs index f46a3c3..d10fd7f 100644 --- a/askama_derive/src/input.rs +++ b/askama_derive/src/input.rs @@ -158,8 +158,8 @@ pub(crate) struct TemplateArgs { escaping: Option, ext: Option, syntax: Option, - config: String, - whitespace: Option, + config: Option, + pub(crate) whitespace: Option, } impl TemplateArgs { @@ -258,7 +258,7 @@ impl TemplateArgs { } } else if ident == "config" { if let syn::Lit::Str(s) = value.lit { - args.config = read_config_file(Some(&s.value()))?; + args.config = Some(s.value()); } else { return Err("config value must be string literal".into()); } @@ -276,8 +276,8 @@ impl TemplateArgs { Ok(args) } - pub(crate) fn config(&self) -> Result, CompileError> { - Config::new(&self.config, self.whitespace.as_ref()) + pub(crate) fn config(&self) -> Result { + read_config_file(self.config.as_deref()) } } -- cgit