clippy fixes

Author: zfarrell

src/catalog/postgres_manager.rs

@@ -8,6 +8,7 @@ use chrono::{DateTime, Utc};
 use sqlx::postgres::PgPoolOptions;
 use sqlx::{PgPool, Postgres};
 use std::fmt::{self, Debug, Formatter};
+use std::str::FromStr;
 
 pub struct PostgresCatalogManager {
     backend: CatalogBackend<Postgres>,

src/catalog/sqlite_manager.rs

@@ -7,6 +7,7 @@ use async_trait::async_trait;
 use chrono::Utc;
 use sqlx::{Sqlite, SqlitePool};
 use std::fmt::{self, Debug, Formatter};
+use std::str::FromStr;
 
 pub struct SqliteCatalogManager {
     backend: CatalogBackend<Sqlite>,

src/secrets/mod.rs

@@ -36,13 +36,17 @@ impl SecretStatus {
             SecretStatus::PendingDelete => "pending_delete",
         }
     }
+}
+
+impl std::str::FromStr for SecretStatus {
+    type Err = ();
 
-    pub fn from_str(s: &str) -> Option<Self> {
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
-            "creating" => Some(SecretStatus::Creating),
-            "active" => Some(SecretStatus::Active),
-            "pending_delete" => Some(SecretStatus::PendingDelete),
-            _ => None,
+            "creating" => Ok(SecretStatus::Creating),
+            "active" => Ok(SecretStatus::Active),
+            "pending_delete" => Ok(SecretStatus::PendingDelete),
+            _ => Err(()),
         }
     }
 }
@@ -162,7 +166,7 @@ impl SecretManager {
             .backend
             .get(&record)
             .await?
-            .ok_or_else(|| SecretError::NotFound(normalized))?;
+            .ok_or(SecretError::NotFound(normalized))?;
 
         Ok(read.value)
     }
@@ -181,7 +185,7 @@ impl SecretManager {
             .get_secret_metadata(&normalized)
             .await
             .map_err(|e| SecretError::Database(e.to_string()))?
-            .ok_or_else(|| SecretError::NotFound(normalized))
+            .ok_or(SecretError::NotFound(normalized))
     }
 
     /// Create a new secret.