From b91e424ab4a2131269a3d8797ce4aa2b062a931c Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Fri, 30 Dec 2022 16:30:16 +0000
Subject: [PATCH] address clippy lints

---
 Cargo.lock                                  |  1 +
 background-jobs/src/persistent_jobs.rs      | 11 +++++------
 background-jobs/src/routes.rs               |  2 +-
 basics/nested-routing/Cargo.toml            |  7 ++++---
 basics/nested-routing/src/{bin => }/main.rs |  5 +++--
 5 files changed, 14 insertions(+), 12 deletions(-)
 rename basics/nested-routing/src/{bin => }/main.rs (70%)

diff --git a/Cargo.lock b/Cargo.lock
index 55e74f9..859891c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4644,6 +4644,7 @@ version = "1.0.0"
 dependencies = [
  "actix-web",
  "env_logger",
+ "log",
  "serde",
  "serde_json",
 ]
diff --git a/background-jobs/src/persistent_jobs.rs b/background-jobs/src/persistent_jobs.rs
index ad1d793..bb6df6c 100644
--- a/background-jobs/src/persistent_jobs.rs
+++ b/background-jobs/src/persistent_jobs.rs
@@ -5,10 +5,8 @@ use std::time::Duration;
 use apalis::{prelude::*, redis::RedisStorage};
 use rand::Rng as _;
 use serde::{Deserialize, Serialize};
-use tokio::task::JoinHandle;
 
 #[derive(Debug, Deserialize, Serialize)]
-
 pub(crate) struct Email {
     to: String,
 }
@@ -51,11 +49,12 @@ pub(crate) async fn start_processing_email_queue() -> anyhow::Result<RedisStorag
     });
 
     // spawn job monitor into background
-    let _ = tokio::spawn(async move {
+    // the monitor manages itself otherwise so we don't need to return a join handle
+    #[allow(clippy::let_underscore_future)]
+    let _ = tokio::spawn(
         // run_without_signals: don't listen for ctrl-c because Actix Web does
-        // the monitor manages itself otherwise so we don't need to return a join handle
-        monitor.run_without_signals().await;
-    });
+        monitor.run_without_signals(),
+    );
 
     Ok(storage)
 }
diff --git a/background-jobs/src/routes.rs b/background-jobs/src/routes.rs
index 894fd30..261e33f 100644
--- a/background-jobs/src/routes.rs
+++ b/background-jobs/src/routes.rs
@@ -31,7 +31,7 @@ pub(crate) async fn cache_item(
     // insert into item cache
     cache.lock().unwrap().insert(form.data, expires);
 
-    Ok(HttpResponse::Ok().body(format!("data cached until {:?}", expires)))
+    Ok(HttpResponse::Ok().body(format!("data cached until {expires}")))
 }
 
 #[post("/email")]
diff --git a/basics/nested-routing/Cargo.toml b/basics/nested-routing/Cargo.toml
index fc27b7f..18909ca 100644
--- a/basics/nested-routing/Cargo.toml
+++ b/basics/nested-routing/Cargo.toml
@@ -4,7 +4,8 @@ version = "1.0.0"
 edition = "2021"
 
 [dependencies]
-actix-web = { workspace = true, features = ["openssl"] }
+actix-web.workspace = true
 env_logger.workspace = true
-serde = { version = "^1.0", features = ["derive"] }
-serde_json = "1.0.39"
+log.workspace = true
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
diff --git a/basics/nested-routing/src/bin/main.rs b/basics/nested-routing/src/main.rs
similarity index 70%
rename from basics/nested-routing/src/bin/main.rs
rename to basics/nested-routing/src/main.rs
index e6569d2..ace80df 100644
--- a/basics/nested-routing/src/bin/main.rs
+++ b/basics/nested-routing/src/main.rs
@@ -3,8 +3,9 @@ use nested_routing::app_config::config_app;
 
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
-    std::env::set_var("RUST_LOG", "actix_server=info,actix_web=info");
-    env_logger::init();
+    env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
+
+    log::info!("starting HTTP server at http://localhost:8080");
 
     HttpServer::new(|| {
         App::new()