Fix lint

Author: fetchfern

apps/labrinth/src/database/postgres_database.rs

@@ -36,15 +36,17 @@ pub async fn connect_all() -> Result<(PgPool, ReadOnlyPgPool), sqlx::Error> {
     let database_url =
         dotenvy::var("DATABASE_URL").expect("`DATABASE_URL` not in .env");
 
-    let acquire_timeout = dotenvy::var("DATABASE_ACQUIRE_TIMEOUT_MS")
-        .ok()
-        .map(|x| {
-            Duration::from_millis(
-                x.parse::<u64>()
-                    .expect("DATABASE_ACQUIRE_TIMEOUT_MS must be a valid u64"),
-            )
-        })
-        .unwrap_or_else(|| Duration::from_millis(30000)); // This is sqlx's default
+    let acquire_timeout =
+        dotenvy::var("DATABASE_ACQUIRE_TIMEOUT_MS")
+            .ok()
+            .map_or_else(
+                || Duration::from_millis(30000),
+                |x| {
+                    Duration::from_millis(x.parse::<u64>().expect(
+                        "DATABASE_ACQUIRE_TIMEOUT_MS must be a valid u64",
+                    ))
+                },
+            );
 
     let pool = PgPoolOptions::new()
         .acquire_timeout(acquire_timeout)

apps/labrinth/src/database/redis.rs

@@ -38,15 +38,17 @@ impl RedisPool {
     // testing pool uses a hashmap to mimic redis behaviour for very small data sizes (ie: tests)
     // PANICS: production pool will panic if redis url is not set
     pub fn new(meta_namespace: Option<String>) -> Self {
-        let wait_timeout = dotenvy::var("REDIS_WAIT_TIMEOUT_MS")
-            .ok()
-            .map(|x| {
-                Duration::from_millis(
-                    x.parse::<u64>()
-                        .expect("REDIS_WAIT_TIMEOUT_MS must be a valid u64"),
-                )
-            })
-            .unwrap_or_else(|| Duration::from_millis(15000));
+        let wait_timeout =
+            dotenvy::var("REDIS_WAIT_TIMEOUT_MS").ok().map_or_else(
+                || Duration::from_millis(15000),
+                |x| {
+                    Duration::from_millis(
+                        x.parse::<u64>().expect(
+                            "REDIS_WAIT_TIMEOUT_MS must be a valid u64",
+                        ),
+                    )
+                },
+            );
 
         let url = dotenvy::var("REDIS_URL").expect("Redis URL not set");
         let pool = Config::from_url(url.clone())