Fix for clippy errors

Clippy returned errors for routing, and also an unrelated block of code with a redundant else block.

Author: andrewsinnovations

src/webserver/http.rs

@@ -533,24 +533,25 @@ pub async fn run_server(config: &AppConfig, state: AppState) -> anyhow::Result<(
         }
         #[cfg(not(target_family = "unix"))]
         anyhow::bail!("Unix sockets are not supported on your operating system. Use listen_on instead of unix_socket.");
-    } else {
-        if let Some(domain) = &config.https_domain {
-            let mut listen_on_https = listen_on;
-            listen_on_https.set_port(443);
-            log::debug!("Will start HTTPS server on {listen_on_https}");
-            let config = make_auto_rustls_config(domain, config);
-            server = server
-                .bind_rustls_0_23(listen_on_https, config)
-                .map_err(|e| bind_error(e, listen_on_https))?;
-        } else if listen_on.port() == 443 {
-            bail!("Please specify a value for https_domain in the configuration file. This is required when using HTTPS (port 443)");
-        }
-        if listen_on.port() != 443 {
-            log::debug!("Will start HTTP server on {listen_on}");
-            server = server
-                .bind(listen_on)
-                .map_err(|e| bind_error(e, listen_on))?;
-        }
+    }
+
+    if let Some(domain) = &config.https_domain {
+        let mut listen_on_https = listen_on;
+        listen_on_https.set_port(443);
+        log::debug!("Will start HTTPS server on {listen_on_https}");
+        let config = make_auto_rustls_config(domain, config);
+        server = server
+            .bind_rustls_0_23(listen_on_https, config)
+            .map_err(|e| bind_error(e, listen_on_https))?;
+    } else if listen_on.port() == 443 {
+        bail!("Please specify a value for https_domain in the configuration file. This is required when using HTTPS (port 443)");
+    }
+
+    if listen_on.port() != 443 {
+        log::debug!("Will start HTTP server on {listen_on}");
+        server = server
+            .bind(listen_on)
+            .map_err(|e| bind_error(e, listen_on))?;
     }
 
     log_welcome_message(config);

src/webserver/routing.rs

@@ -117,35 +117,30 @@ where
 {
     if path_and_query.path().ends_with(FORWARD_SLASH) {
         path.push(INDEX);
-        match find_file_or_not_found(&path, SQL_EXTENSION, store).await {
-            Ok(NotFound) => {
-                let target_sql = path
-                    .parent()
-                    .unwrap_or_else(|| Path::new("/"))
-                    .join("_.sql");
-                if store.contains(&target_sql).await? {
-                    Ok(Execute(target_sql))
-                } else {
-                    Ok(NotFound)
-                }
+        if let Ok(NotFound) = find_file_or_not_found(&path, SQL_EXTENSION, store).await {
+            let target_sql = path.parent().unwrap_or_else(|| Path::new("/")).join("_.sql");
+            if store.contains(&target_sql).await? {
+                Ok(Execute(target_sql))
+            } else {
+                Ok(NotFound)
             }
-            result => result,
+        } else {
+            find_file_or_not_found(&path, SQL_EXTENSION, store).await
         }
     } else {
         let path_with_ext = path.with_extension(SQL_EXTENSION);
-        match find_file(&path_with_ext, SQL_EXTENSION, store).await? {
-            Some(action) => Ok(action),
-            None => {
-                let mut parent = path.parent();
-                while let Some(p) = parent {
-                    let target_sql = p.join("_.sql");
-                    if store.contains(&target_sql).await? {
-                        return find_file_or_not_found(&path, SQL_EXTENSION, store).await;
-                    }
-                    parent = p.parent();
+        if let Some(action) = find_file(&path_with_ext, SQL_EXTENSION, store).await? {
+            Ok(action)
+        } else {
+            let mut parent = path.parent();
+            while let Some(p) = parent {
+                let target_sql = p.join("_.sql");
+                if store.contains(&target_sql).await? {
+                    return find_file_or_not_found(&path, SQL_EXTENSION, store).await;
                 }
-                Ok(Redirect(append_to_path(path_and_query, FORWARD_SLASH)))
+                parent = p.parent();
             }
+            Ok(Redirect(append_to_path(path_and_query, FORWARD_SLASH)))
         }
     }
 }

test/models/_.sql

@@ -0,0 +1,2 @@
+select sqlpage.path();
+select sqlpage.variables();