fix: clippy

Author: conblem

src/api/metrics.rs

@@ -126,7 +126,7 @@ where
     }
 }
 
-const TEXT_PLAIN_MIME: &'static str = "text/plain";
+const TEXT_PLAIN_MIME: &str = "text/plain";
 
 // maybe this implementation is wrong as it removes bucket items aswell
 fn metrics_handler() -> impl Reply {
@@ -154,7 +154,7 @@ fn metrics_handler() -> impl Reply {
         .into_response()
 }
 
-const METRICS_PATH: &'static str = "metrics";
+const METRICS_PATH: &str = "metrics";
 
 pub(super) fn metrics(
 ) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone + Send + 'static {

src/api/mod.rs

@@ -104,5 +104,4 @@ where
 }
 
 fn noop<T>(_: T) {
-    ()
 }

src/api/routes.rs

@@ -36,15 +36,15 @@ async fn register_handler(pool: PgPool) -> Result<impl Reply, Rejection> {
     Ok(res)
 }
 
-const X_API_USER_HEADER: &'static str = "X-Api-User";
-const X_API_KEY_HEADER: &'static str = "X-Api-Key";
+const X_API_USER_HEADER: &str = "X-Api-User";
+const X_API_KEY_HEADER: &str = "X-Api-Key";
 
 async fn update_handler(user: String, key: String, _pool: PgPool) -> Result<impl Reply, Rejection> {
     Ok(format!("{} {}", user, key))
 }
 
-const REGISTER_PATH: &'static str = "register";
-const UPDATE_PATH: &'static str = "update";
+const REGISTER_PATH: &str = "register";
+const UPDATE_PATH: &str = "update";
 
 pub(super) fn routes(
     pool: PgPool,

src/cert.rs

@@ -257,8 +257,7 @@ impl CertManager {
 
             let chall = order
                 .authorizations()?
-                .iter()
-                .next()
+                .get(0)
                 .ok_or_else(|| anyhow!("couldn't unpack auths"))?
                 .dns_challenge();
 

src/config.rs

@@ -22,10 +22,9 @@ impl<'de> Deserialize<'de> for ProxyProtocol {
     where
         D: Deserializer<'de>,
     {
-        match bool::deserialize(deserializer) {
-            Ok(true) => Ok(ProxyProtocol::Enabled),
-            Ok(false) => Ok(ProxyProtocol::Disabled),
-            Err(e) => Err(e),
+        match bool::deserialize(deserializer)? {
+            true => Ok(ProxyProtocol::Enabled),
+            false => Ok(ProxyProtocol::Disabled),
         }
     }
 }

src/main.rs

@@ -44,46 +44,40 @@ fn run() -> Result<()> {
 
     // Async closure cannot be move, if runtime gets moved into it
     // it gets dropped inside an async call
-    let res: Result<()> = runtime.block_on(
-        async {
-            debug!("Running in runtime");
-
-            let pool = setup_database(&config.general.db).await?;
-            let authority =
-                DatabaseAuthority::new(pool.clone(), &config.general.name, config.records);
-            let dns = DNS::new(&config.general.dns, authority);
-
-            let api = &config.api;
-            let api = api::new(
-                (api.http.clone(), api.http_proxy),
-                (api.https.clone(), api.https_proxy),
-                (api.prom.clone(), api.prom_proxy),
-                pool.clone(),
-            )
-            .and_then(Api::spawn);
-
-            let persist = DatabasePersist::new(pool.clone(), &runtime);
-            let cert_manager = CertManager::new(pool, persist, config.general.acme, &runtime)
-                .and_then(CertManager::spawn);
-
-            info!("Starting API Cert Manager and DNS");
-            tokio::select! {
-                res = api => res,
-                res = cert_manager => res,
-                res = dns.spawn() => res,
-                res = ctrl_c() => {
-                    res?;
-                    info!("Ctrl C pressed");
-                    Ok(())
-                }
+    let fut = async {
+        debug!("Running in runtime");
+
+        let pool = setup_database(&config.general.db).await?;
+        let authority = DatabaseAuthority::new(pool.clone(), &config.general.name, config.records);
+        let dns = DNS::new(&config.general.dns, authority);
+
+        let api = &config.api;
+        let api = api::new(
+            (api.http.clone(), api.http_proxy),
+            (api.https.clone(), api.https_proxy),
+            (api.prom.clone(), api.prom_proxy),
+            pool.clone(),
+        )
+        .and_then(Api::spawn);
+
+        let persist = DatabasePersist::new(pool.clone(), &runtime);
+        let cert_manager = CertManager::new(pool, persist, config.general.acme, &runtime)
+            .and_then(CertManager::spawn);
+
+        info!("Starting API Cert Manager and DNS");
+        tokio::select! {
+            res = api => res,
+            res = cert_manager => res,
+            res = dns.spawn() => res,
+            res = ctrl_c() => {
+                res?;
+                info!("Ctrl C pressed");
+                Ok(())
             }
         }
-        .in_current_span(),
-    );
-
-    res?;
+    };
 
-    Ok(())
+    runtime.block_on(fut.in_current_span())
 }
 
 #[tracing::instrument(skip(db))]