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

Revert rustfmt changes to TemplateInfo block

This commit is contained in:
Marcus Ball 2016-12-28 23:57:08 -05:00
parent 7d35841502
commit 19ed10f2b8
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/src/templates/mod.rs
View File

@ -218,16 +218,12 @@ fn discover_templates() -> HashMap<String, TemplateInfo> {
glob_path.set_extension(ext); glob_path.set_extension(ext);
for path in glob(glob_path.to_str().unwrap()).unwrap().filter_map(Result::ok) { for path in glob(glob_path.to_str().unwrap()).unwrap().filter_map(Result::ok) {
let (rel_path, name, data_type) = split_path(&path); let (rel_path, name, data_type) = split_path(&path);
templates.insert(name, templates.insert(name, TemplateInfo {
TemplateInfo { full_path: path.to_path_buf(),
full_path: path.to_path_buf(), path: rel_path,
path: rel_path, extension: path.extension().unwrap().to_string_lossy().into_owned(),
extension: path.extension() data_type: data_type,
.unwrap() });
.to_string_lossy()
.into_owned(),
data_type: data_type,
});
} }
} }