Deal with all lints

[rbdr/blog] / src / generator / mod.rs

diff --git a/src/generator/mod.rs b/src/generator/mod.rs
index 293ad7df59d16af38a5d1c4dbe547471a86f3bf7..dbe1c2e3ef3162b871c63e72fa61fcb3ffaaeade 100644 (file)
--- a/src/generator/mod.rs
+++ b/src/generator/mod.rs
@@ -4,18 +4,20 @@ mod static_files;
 mod txt;
 
 use crate::post::Post;
-use crate::template::TemplateContext;
+use crate::template::Context;
 use std::io::Result;
-use std::path::PathBuf;
+use std::path::Path;
+
+type Generator = fn(&Path, &Path, &Path, &Context) -> Result<()>;
 
 pub fn generate(
-    static_directory: &PathBuf,
-    template_directory: &PathBuf,
-    output_directory: &PathBuf,
-    posts: &Vec<Post>,
+    static_directory: &Path,
+    template_directory: &Path,
+    output_directory: &Path,
+    posts: &[Post],
 ) -> Result<()> {
     let generators = available_generators();
-    let context = Post::to_template_context(&posts);
+    let context = Post::to_template_context(posts);
     for generator in generators {
         generator(
             static_directory,
@@ -27,7 +29,7 @@ pub fn generate(
     Ok(())
 }
 
-fn available_generators() -> Vec<fn(&PathBuf, &PathBuf, &PathBuf, &TemplateContext) -> Result<()>> {
+fn available_generators() -> Vec<Generator> {
     vec![
         static_files::generate,
         // These three are actually the same. Can generalize, don't know how in rust yet.