Address more linter issues

diff --git a/src/configuration.rs b/src/configuration.rs
index a117f296555c5e759f8874ed8b7448909befc83b..1d7ce6a1608f6bcb21b0008bffb4050d724de20e 100644 (file)
--- a/src/configuration.rs
+++ b/src/configuration.rs
@@ -150,9 +150,9 @@ mod tests {
         let default_configuration = Configuration::new();
 
         let test_dir = setup_test_dir();
-        env::set_var("BLOG_CONFIG_DIRECTORY", &test_dir.join("config"));
-        env::set_var("BLOG_DATA_DIRECTORY", &test_dir.join("data"));
-        env::set_var("BLOG_OUTPUT_DIRECTORY", &test_dir.join("output"));
+        env::set_var("BLOG_CONFIG_DIRECTORY", test_dir.join("config"));
+        env::set_var("BLOG_DATA_DIRECTORY", test_dir.join("data"));
+        env::set_var("BLOG_OUTPUT_DIRECTORY", test_dir.join("output"));
         env::set_var("BLOG_MAX_POSTS", "99");
         let override_configuration = Configuration::new();
 

diff --git a/src/metadata.rs b/src/metadata.rs
index d6b3d6aa9fd3642e155fab5c96b93bb542800d6d..f2890a4975ef3a179e1d2a9fe09848842ce5502f 100644 (file)
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -71,7 +71,7 @@ mod tests {
         let metadata = Metadata::read_or_create(&test_dir.join("metadata.json"));
 
         assert_eq!(metadata.id, "cool");
-        assert_eq!(metadata.created_on, 1736105008957);
+        assert_eq!(metadata.created_on, 1_736_105_008_957);
     }
 
     #[test]
@@ -86,7 +86,7 @@ mod tests {
     #[test]
     fn test_creates_metadata_if_file_is_malformed() {
         let test_dir = setup_test_dir();
-        write(&test_dir.join("metadata.json"), vec![0xFF, 0xFF]).expect("Failed to write file");
+        write(test_dir.join("metadata.json"), vec![0xFF, 0xFF]).expect("Failed to write file");
 
         let metadata = Metadata::read_or_create(&test_dir.join("metadata.json"));
         assert_eq!(metadata.created_on.to_string(), metadata.id);
@@ -96,7 +96,7 @@ mod tests {
     fn test_it_returns_created_on_as_rfc_2822_utc() {
         let metadata = Metadata {
             id: "cool".to_string(),
-            created_on: 1736035200000,
+            created_on: 1_736_035_200_000,
         };
 
         if let Some(created_on_utc) = metadata.created_on_utc() {

diff --git a/src/post.rs b/src/post.rs
index 51614aae97eb82e2686aca74772328d5a7a8b4cd..ef744b42a4ca07c11d14cea23382ae01280c8843 100644 (file)
--- a/src/post.rs
+++ b/src/post.rs
@@ -122,7 +122,7 @@ mod tests {
         let post = Post {
             metadata: Metadata {
                 id: "cool".to_string(),
-                created_on: 1736035200000,
+                created_on: 1_736_035_200_000,
             },
             index: 28,
             html: "<p>beep boop</p>".to_string(),
@@ -135,7 +135,7 @@ beep boop"
         let context = post.to_template_value();
 
         assert_eq!(context["id"], Value::String("cool".to_string()));
-        assert_eq!(context["created_on"], Value::Unsigned(1736035200000));
+        assert_eq!(context["created_on"], Value::Unsigned(1_736_035_200_000));
         assert_eq!(
             context["created_on_utc"],
             Value::String("Sun, 05 Jan 2025 00:00:00 +0000".to_string())

diff --git a/src/template.rs b/src/template.rs
index 53639d9799e5375a55a14755e940ba16309439e8..9e12f32eb6f992c39789381367d39cb420e33e4d 100644 (file)
--- a/src/template.rs
+++ b/src/template.rs
@@ -311,9 +311,9 @@ mod tests {
     fn test_empty_string_can_be_parsed() {
         let template = "";
 
-        if let Some(template) = parse(&template) {
+        if let Some(template) = parse(template) {
             assert_eq!(template.tokens.len(), 1);
-            assert_eq!(template.tokens[0], Token::Text("".to_string()));
+            assert_eq!(template.tokens[0], Token::Text(String::new()));
         } else {
             panic!("Expected empty template to be parsed");
         }
@@ -323,7 +323,7 @@ mod tests {
     fn fails_on_malformed_directive() {
         let template = "{{ Left door open";
 
-        let parsed_template = parse(&template);
+        let parsed_template = parse(template);
         assert!(parsed_template.is_none());
     }
 
@@ -331,7 +331,7 @@ mod tests {
     fn fails_on_malformed_conditional() {
         let template = "{{? hello }} NO TERMINATOR!!";
 
-        let parsed_template = parse(&template);
+        let parsed_template = parse(template);
         assert!(parsed_template.is_none());
     }
 
@@ -339,7 +339,7 @@ mod tests {
     fn fails_on_malformed_iterator() {
         let template = "{{~ hello }} NO TERMINATOR!!";
 
-        let parsed_template = parse(&template);
+        let parsed_template = parse(template);
         assert!(parsed_template.is_none());
     }
 
@@ -347,7 +347,7 @@ mod tests {
     fn fails_on_malformed_conditional_body() {
         let template = "{{? hello }} {{ someone forgot {{?}}";
 
-        let parsed_template = parse(&template);
+        let parsed_template = parse(template);
         assert!(parsed_template.is_none());
     }
 
@@ -355,7 +355,7 @@ mod tests {
     fn fails_on_malformed_iterator_body() {
         let template = "{{~ hello }} {{ my right hand claw {{~}}";
 
-        let parsed_template = parse(&template);
+        let parsed_template = parse(template);
         assert!(parsed_template.is_none());
     }
 
@@ -363,10 +363,7 @@ mod tests {
     fn test_fails_on_invalid_directives() {
         let template = "My name is {{ name }}";
 
-        let context: Context =
-            HashMap::from([("name".to_string(), Value::String("Scrooge".to_string()))]);
-
-        let template = parse(&template);
+        let template = parse(template);
         assert!(template.is_none());
     }
 
@@ -374,7 +371,7 @@ mod tests {
     fn test_recognizes_display_directive() {
         let template = "My name is: {{= blog }}";
 
-        if let Some(template) = parse(&template) {
+        if let Some(template) = parse(template) {
             assert_eq!(template.tokens.len(), 3);
             assert_eq!(template.tokens[0], Token::Text("My name is: ".to_string()));
             assert_eq!(
@@ -383,7 +380,7 @@ mod tests {
                     content: "blog".to_string()
                 }
             );
-            assert_eq!(template.tokens[2], Token::Text("".to_string()));
+            assert_eq!(template.tokens[2], Token::Text(String::new()));
         } else {
             panic!("Expected empty template to be parsed");
         }
@@ -393,7 +390,7 @@ mod tests {
     fn test_not_allowed_to_nest_directives_in_display() {
         let template = "{{= {{ hello }} }}";
 
-        if let Some(template) = parse(&template) {
+        if let Some(template) = parse(template) {
             assert_eq!(template.tokens.len(), 2);
             assert_eq!(
                 template.tokens[0],
@@ -411,7 +408,7 @@ mod tests {
     fn test_recognizes_conditional_directive() {
         let template = "{{? what }}OK {{= hello }}{{?}}";
 
-        if let Some(template) = parse(&template) {
+        if let Some(template) = parse(template) {
             assert_eq!(template.tokens.len(), 2);
             assert_eq!(
                 template.tokens[0],
@@ -422,11 +419,11 @@ mod tests {
                         Token::DisplayDirective {
                             content: "hello".to_string()
                         },
-                        Token::Text("".to_string()),
+                        Token::Text(String::new()),
                     ]
                 }
             );
-            assert_eq!(template.tokens[1], Token::Text("".to_string()));
+            assert_eq!(template.tokens[1], Token::Text(String::new()));
         } else {
             panic!("Expected empty template to be parsed");
         }
@@ -436,7 +433,7 @@ mod tests {
     fn test_recognizes_iterator_directive() {
         let template = "{{~ murder:crow }}Sound: {{= caw }}{{~}}";
 
-        if let Some(template) = parse(&template) {
+        if let Some(template) = parse(template) {
             assert_eq!(template.tokens.len(), 2);
             assert_eq!(
                 template.tokens[0],
@@ -448,11 +445,11 @@ mod tests {
                         Token::DisplayDirective {
                             content: "caw".to_string()
                         },
-                        Token::Text("".to_string()),
+                        Token::Text(String::new()),
                     ]
                 }
             );
-            assert_eq!(template.tokens[1], Token::Text("".to_string()));
+            assert_eq!(template.tokens[1], Token::Text(String::new()));
         } else {
             panic!("Expected empty template to be parsed");
         }
@@ -538,7 +535,7 @@ One last {{= last.one }}
             ),
         ]);
 
-        if let Some(template) = parse(&template) {
+        if let Some(template) = parse(template) {
             match template.render(&context) {
                 Err(error) => panic!("{error}"),
                 Ok(output) => assert_eq!(
@@ -566,7 +563,7 @@ One last OK
 
         let context: Context = HashMap::new();
 
-        if let Some(template) = parse(&template) {
+        if let Some(template) = parse(template) {
             let output = template.render(&context);
             assert!(output.is_err());
         } else {
@@ -580,7 +577,7 @@ One last OK
 
         let context: Context = HashMap::new();
 
-        if let Some(template) = parse(&template) {
+        if let Some(template) = parse(template) {
             let output = template.render(&context);
             assert!(output.is_err());
         } else {
@@ -597,7 +594,7 @@ One last OK
             Value::String("more a comment than a question".to_string()),
         )]);
 
-        if let Some(template) = parse(&template) {
+        if let Some(template) = parse(template) {
             let output = template.render(&context);
             assert!(output.is_err());
         } else {
@@ -611,7 +608,7 @@ One last OK
 
         let context: Context = HashMap::new();
 
-        if let Some(template) = parse(&template) {
+        if let Some(template) = parse(template) {
             let output = template.render(&context);
             assert!(output.is_err());
         } else {
@@ -631,7 +628,7 @@ One last OK
             )])]),
         )]);
 
-        if let Some(template) = parse(&template) {
+        if let Some(template) = parse(template) {
             let output = template.render(&context);
             assert!(output.is_err());
         } else {
@@ -646,7 +643,7 @@ One last OK
         let context: Context =
             HashMap::from([("sheeps".to_string(), Value::String("wolf".to_string()))]);
 
-        if let Some(template) = parse(&template) {
+        if let Some(template) = parse(template) {
             let output = template.render(&context);
             assert!(output.is_err());
         } else {
@@ -685,7 +682,7 @@ One last OK
             &PathBuf::from("/norealpath/ifthisfails/then/wow"),
             "index.html",
         );
-        assert!(!template.is_none());
+        assert!(template.is_some());
     }
 
     #[test]
@@ -694,7 +691,7 @@ One last OK
             &PathBuf::from("/norealpath/ifthisfails/then/wow"),
             "index.txt",
         );
-        assert!(!template.is_none());
+        assert!(template.is_some());
     }
 
     #[test]
@@ -703,7 +700,7 @@ One last OK
             &PathBuf::from("/norealpath/ifthisfails/then/wow"),
             "index.gmi",
         );
-        assert!(!template.is_none());
+        assert!(template.is_some());
     }
 
     #[test]
@@ -712,6 +709,6 @@ One last OK
             &PathBuf::from("/norealpath/ifthisfails/then/wow"),
             "index.rss",
         );
-        assert!(!template.is_none());
+        assert!(template.is_some());
     }
 }