From 382e43b55fc7c3785092d54a838e347684e89807 Mon Sep 17 00:00:00 2001
From: Ondrej Vlach <ondrej@vlach.xyz>
Date: Sun, 3 Dec 2023 17:41:04 +0100
Subject: [PATCH] clippy

---
 src/routes/root.rs  |  8 +++-----
 src/tools/lang.rs   |  3 ---
 src/tools/mod.rs    |  1 -
 src/tools/rocket.rs |  4 +---
 src/tools/tera.rs   | 28 ++++++++++++----------------
 5 files changed, 16 insertions(+), 28 deletions(-)
 delete mode 100644 src/tools/lang.rs

diff --git a/src/routes/root.rs b/src/routes/root.rs
index 83ad1dc..73a6b65 100644
--- a/src/routes/root.rs
+++ b/src/routes/root.rs
@@ -1,10 +1,8 @@
-use std::{thread::sleep, time::Duration};
-
 use log::error;
 use nanobyte_opentelemetry::rocket::{OtelReqwestClient, TracingSpan};
 use nanobyte_tera::l18n::LanguageDescription;
 use ovlach_data::cv::data::CV;
-use rocket::{get, State, response::Redirect, http::Status, futures::executor::enter};
+use rocket::{get, State, response::Redirect, http::Status};
 use rocket_dyn_templates::Template;
 use serde::Serialize;
 
@@ -28,7 +26,7 @@ default_person: &State<DefaultPerson>, frontend_svc: &State<FrontendSVCConfig>,
         Ok(cv) => RootPage {
             static_host: presentation_config.static_route.clone(),
             cv,
-            lang: LanguageDescription::new(&language.language.as_str(), "ovlach_frontend"),
+            lang: LanguageDescription::new(language.language.as_str(), "ovlach_frontend"),
             contact_svc: frontend_svc.inner().contact_service.clone(),
             pdf_download_url: format!("{}/cv/{}/output.pdf", frontend_svc.inner().pdf_service.clone(), default_person.default_person_name)
         },
@@ -39,7 +37,7 @@ default_person: &State<DefaultPerson>, frontend_svc: &State<FrontendSVCConfig>,
         }
     };
 
-    let result = Ok(Template::render("default", &context));
+    let result = Ok(Template::render("default", context));
     drop(span);
     result
 }
diff --git a/src/tools/lang.rs b/src/tools/lang.rs
deleted file mode 100644
index 3801c86..0000000
--- a/src/tools/lang.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub fn get_lang_name_from_code(lang: &str) -> &str {
-    lang.split("-").collect::<Vec<&str>>()[0]
-}
diff --git a/src/tools/mod.rs b/src/tools/mod.rs
index 1cb158d..4788fb0 100644
--- a/src/tools/mod.rs
+++ b/src/tools/mod.rs
@@ -1,3 +1,2 @@
 pub(crate) mod rocket;
-pub(crate) mod lang;
 pub(crate) mod tera;
diff --git a/src/tools/rocket.rs b/src/tools/rocket.rs
index edbd873..aa060cd 100644
--- a/src/tools/rocket.rs
+++ b/src/tools/rocket.rs
@@ -1,6 +1,4 @@
-use std::time::SystemTime;
-use log::info;
-use rocket::{Request, Response, Data, fairing::{Kind, Info, Fairing}, request::{self, FromRequest, FromParam}, http::Status};
+use rocket::request::FromParam;
 use phf::phf_map;
 
 
diff --git a/src/tools/tera.rs b/src/tools/tera.rs
index f2e9e30..3015ff6 100644
--- a/src/tools/tera.rs
+++ b/src/tools/tera.rs
@@ -39,21 +39,19 @@ pub fn advanced_filter(value: &Value, args: &HashMap<String, Value>) -> Result<V
                     "only" => true,
                     _ => false,
                 }
-            } else {
-                if null != "only" {
-                    let val = tested_value.as_str();
-                    match val {
-                        Some(match_v) => {
-                            match against_value.clone() {
-                                Some(against_v) => match_v == against_v,
-                                None => true,
-                            }
+            } else if null != "only" {
+                let val = tested_value.as_str();
+                match val {
+                    Some(match_v) => {
+                        match against_value.clone() {
+                            Some(against_v) => match_v == against_v,
+                            None => true,
                         }
-                        None => true,
                     }
-                } else {
-                    false
+                    None => true,
                 }
+            } else {
+                false
             }
         })
         .collect::<Vec<_>>();
@@ -99,8 +97,6 @@ mod tests {
         assert_eq!(result, json!(generate_test_class(Some("foo".to_string()), None)));
         let result = call_advanced_filter(&data, "none", None).unwrap();
         assert_eq!(result,  json!(vec![TestClass::new(Some("foo".to_string()))]));
-        let mut vec: Vec<TestClass> = Vec::new();
-        vec.push(TestClass::new(None));
         let result = call_advanced_filter(&data, "only", None).unwrap();
         assert_eq!(result, json!(vec![TestClass::new(None)]));
 
@@ -108,9 +104,9 @@ mod tests {
         let result = call_advanced_filter(&data, "all", Some("foo")).unwrap();
         assert_eq!(result, json!(vec![TestClass::new(Some("foo".to_string())), TestClass::new(None)]));
         let result = call_advanced_filter(&data, "none", Some("bar")).unwrap();
-        let vec: Vec<TestClass> = Vec::new();
+        let vec: Vec<TestClass> = vec![];
         assert_eq!(result, json!(vec));
         let result = call_advanced_filter(&data, "only", Some("zz")).is_err();
-        assert_eq!(result, true);
+        assert!(result);
     }
 }