clippy

Author: lovasoa

src/app_config.rs

@@ -18,8 +18,8 @@ impl AppConfig {
         let mut config = if let Some(config_file) = &cli.config_file {
             if !config_file.is_file() {
                 return Err(anyhow::anyhow!(
-                    "Configuration file does not exist: {:?}",
-                    config_file
+                    "Configuration file does not exist: {}",
+                    config_file.display()
                 ));
             }
             log::debug!("Loading configuration from file: {}", config_file.display());
@@ -85,14 +85,14 @@ impl AppConfig {
     fn validate(&self) -> anyhow::Result<()> {
         if !self.web_root.is_dir() {
             return Err(anyhow::anyhow!(
-                "Web root is not a valid directory: {:?}",
-                self.web_root
+                "Web root is not a valid directory: {}",
+                self.web_root.display()
             ));
         }
         if !self.configuration_directory.is_dir() {
             return Err(anyhow::anyhow!(
-                "Configuration directory is not a valid directory: {:?}",
-                self.configuration_directory
+                "Configuration directory is not a valid directory: {}",
+                self.configuration_directory.display()
             ));
         }
         if self.database_connection_acquire_timeout_seconds <= 0.0 {

src/filesystem.rs

@@ -160,8 +160,9 @@ impl FileSystem {
                     }
                 } else {
                     anyhow::bail!(
-                    "Unsupported path: {path:?}. Path component '{component:?}' is not allowed."
-                );
+                        "Unsupported path: {}. Path component '{component:?}' is not allowed.",
+                        path.display()
+                    );
                 }
             }
         }

src/render.rs

@@ -211,7 +211,7 @@ impl HeaderContext {
             Some("none") => actix_web::cookie::SameSite::None,
             Some("lax") => actix_web::cookie::SameSite::Lax,
             None | Some("strict") => actix_web::cookie::SameSite::Strict, // strict by default
-            Some(other) => bail!("Cookie: invalid value for same_site: {}", other),
+            Some(other) => bail!("Cookie: invalid value for same_site: {other}"),
         });
         let secure = obj.get("secure");
         cookie.set_secure(secure != Some(&json!(false)) && secure != Some(&json!(0)));
@@ -392,7 +392,7 @@ async fn verify_password_async(
 ) -> Result<Result<(), password_hash::Error>, anyhow::Error> {
     tokio::task::spawn_blocking(move || {
         let hash = password_hash::PasswordHash::new(&password_hash)
-            .map_err(|e| anyhow::anyhow!("invalid value for the password_hash property: {}", e))?;
+            .map_err(|e| anyhow::anyhow!("invalid value for the password_hash property: {e}"))?;
         let phfs = &[&argon2::Argon2::default() as &dyn password_hash::PasswordVerifier];
         Ok(hash.verify_password(phfs, password))
     })
@@ -735,7 +735,7 @@ impl<W: std::io::Write> HtmlRenderContext<W> {
         data: &JsonValue,
     ) -> anyhow::Result<()> {
         if Self::is_shell_component(component_name) {
-            bail!("There cannot be more than a single shell per page. You are trying to open the {} component, but a shell component is already opened for the current page. You can fix this by removing the extra shell component, or by moving this component to the top of the SQL file, before any other component that displays data.", component_name);
+            bail!("There cannot be more than a single shell per page. You are trying to open the {component_name} component, but a shell component is already opened for the current page. You can fix this by removing the extra shell component, or by moving this component to the top of the SQL file, before any other component that displays data.");
         }
 
         if component_name == "log" {

src/webserver/database/execute_queries.rs

@@ -302,7 +302,7 @@ fn debug_row(r: &AnyRow) {
 }
 
 fn clone_anyhow_err(source_file: &Path, err: &anyhow::Error) -> anyhow::Error {
-    let mut e = anyhow!("{source_file:?} contains a syntax error preventing SQLPage from parsing and preparing its SQL statements.");
+    let mut e = anyhow!("{} contains a syntax error preventing SQLPage from parsing and preparing its SQL statements.", source_file.display());
     for c in err.chain().rev() {
         e = e.context(c.to_string());
     }

src/webserver/database/sqlpage_functions/functions.rs

@@ -347,7 +347,7 @@ pub(crate) async fn hash_password(password: Option<String>) -> anyhow::Result<Op
         let phf = argon2::Argon2::default();
         let salt = password_hash::SaltString::generate(&mut password_hash::rand_core::OsRng);
         let password_hash = &password_hash::PasswordHash::generate(phf, password, &salt)
-            .map_err(|e| anyhow!("Unable to hash password: {}", e))?;
+            .map_err(|e| anyhow!("Unable to hash password: {e}"))?;
         Ok(password_hash.to_string())
     })
     .await?

src/webserver/database/syntax_tree.rs

@@ -176,7 +176,7 @@ pub(super) async fn extract_req_param<'a>(
                 get_val.map(SingleOrVec::as_json_str)
             }
         }
-        StmtParam::Error(x) => anyhow::bail!("{}", x),
+        StmtParam::Error(x) => anyhow::bail!("{x}"),
         StmtParam::Literal(x) => Some(Cow::Owned(x.clone())),
         StmtParam::Null => None,
         StmtParam::Concat(args) => concat_params(&args[..], request, db_connection).await?,

src/webserver/oidc.rs

@@ -221,7 +221,7 @@ impl OidcState {
         let nonce_verifier = |nonce: Option<&Nonce>| check_nonce(nonce, expected_nonce);
         let claims: OidcClaims = id_token
             .into_claims(&verifier, nonce_verifier)
-            .map_err(|e| anyhow::anyhow!("Could not verify the ID token: {}", e))?;
+            .map_err(|e| anyhow::anyhow!("Could not verify the ID token: {e}"))?;
         Ok(claims)
     }
 }