Deal with all lints

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

diff --git a/src/generator/rss.rs b/src/generator/rss.rs
index 9705f8e8dc7766440288e333e1beb1cb89d78e95..e79694e96c15de7cd48c95f84324c074e7e6f46b 100644 (file)
--- a/src/generator/rss.rs
+++ b/src/generator/rss.rs
@@ -1,25 +1,22 @@
-use crate::template::{find, parse, TemplateContext};
+use crate::template::{find, parse, Context};

 use std::fs::write;
 use std::io::{Error, ErrorKind::Other, Result};
 use std::fs::write;
 use std::io::{Error, ErrorKind::Other, Result};

-use std::path::PathBuf;
+use std::path::Path;

 
 const FILENAME: &str = "feed.xml";
 
 pub fn generate(
 
 const FILENAME: &str = "feed.xml";
 
 pub fn generate(

-    _: &PathBuf,
-    template_directory: &PathBuf,
-    target: &PathBuf,
-    context: &TemplateContext,
+    _: &Path,
+    template_directory: &Path,
+    target: &Path,
+    context: &Context,

 ) -> Result<()> {
 ) -> Result<()> {

-    match find(template_directory, FILENAME) {
-        Some(template) => {
-            let parsed_template = parse(&template)
-                .ok_or_else(|| Error::new(Other, "Unable to parse RSS template"))?;
-            let rendered_template = parsed_template.render(context)?;
-            let location = target.join(FILENAME);
-            write(location, rendered_template)?;
-        }
-        None => {}
+    if let Some(template) = find(template_directory, FILENAME) {
+        let parsed_template =
+            parse(&template).ok_or_else(|| Error::new(Other, "Unable to parse RSS template"))?;
+        let rendered_template = parsed_template.render(context)?;
+        let location = target.join(FILENAME);
+        write(location, rendered_template)?;

     }
     Ok(())
 }
     }
     Ok(())
 }