rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minimize logic in tera autoescape config closure 

Incorporate feedback from SergioBenitez: define extension list outside
closure and remove unnecessary comment
This commit is contained in:
Joel Roller 2016-12-28 20:22:53 -06:00
parent 5a99e92e14
commit 5b1186a530
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/src/templates/tera_templates.rs
View File

@ -8,15 +8,12 @@ use super::{TemplateInfo, TEMPLATE_DIR};
lazy_static! {
static ref TERA: Result<tera::Tera, String> = {
let path: PathBuf = [&*TEMPLATE_DIR, "**", "*.tera"].iter().collect();
let escape_ext = [".html.tera", ".htm.tera", ".xml.tera",
".html", ".htm", ".xml"];
tera::Tera::new(path.to_str().unwrap())
.map(|mut t| {
t.autoescape_on(vec![
// defaults with .tera extension
".html.tera",".htm.tera",".xml.tera",
// keep tera default extensions
".html",".htm",".xml"
]);
t
.map(|mut tera| {
tera.autoescape_on(escape_ext.to_vec());
tera
})
.map_err(|e| format!("{:?}", e))
};