itsscb/askama
1
0
Fork 0
mirror of https://github.com/askama-rs/askama.git synced 2025-10-02 15:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed to allow both path and ext

Browse Source
This commit is contained in:
vallentin 2021-03-09 06:40:52 +01:00 committed by Dirkjan Ochtman
parent 606c68dd34
commit d6c05d8eb9
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
askama_shared/src/input.rs
View File

@ -124,11 +124,8 @@ impl<'a> TemplateInput<'a> {
// of `ext` is merged into a synthetic `path` value here.
let source = source.expect("template path or source not found in attributes");
let path = match (&source, &ext) {
(&Source::Path(ref path), None) => config.find_template(path, None)?,
(&Source::Path(ref path), _) => config.find_template(path, None)?,
(&Source::Source(_), Some(ext)) => PathBuf::from(format!("{}.{}", ast.ident, ext)),
(&Source::Path(_), Some(_)) => {
return Err("'ext' attribute cannot be used with 'path' attribute".into())
}
(&Source::Source(_), None) => {
return Err("must include 'ext' attribute when using 'source' attribute".into())
}
@ -200,7 +197,7 @@ impl<'a> TemplateInput<'a> {
}
pub fn extension(&self) -> Option<&str> {
extension(&self.path)
self.ext.as_deref().or_else(|| extension(&self.path))
}
}