Merge branch 'main' into wip/mobile

1 files changed, 5 insertions, 10 deletions

diff --git a/src/db/mod.rs b/src/db/mod.rs
index 6005813..e0522d4 100644
--- a/src/db/mod.rs
+++ b/src/db/mod.rs
@@ -130,14 +130,17 @@ pub enum Error {
     Rejected(String, String),
 }
 
-pub trait NotFound {
+pub trait NotFound: Sized {
     type Ok;
     type Error;
 
     fn not_found<E, F>(self, map: F) -> Result<Self::Ok, E>
     where
         E: From<Self::Error>,
-        F: FnOnce() -> E;
+        F: FnOnce() -> E,
+    {
+        self.optional()?.ok_or_else(map)
+    }
 
     fn optional(self) -> Result<Option<Self::Ok>, Self::Error>;
 }
@@ -153,14 +156,6 @@ impl<T> NotFound for Result<T, sqlx::Error> {
             Err(other) => Err(other),
         }
     }
-
-    fn not_found<E, F>(self, map: F) -> Result<T, E>
-    where
-        E: From<sqlx::Error>,
-        F: FnOnce() -> E,
-    {
-        self.optional()?.ok_or_else(map)
-    }
 }
 
 pub trait Duplicate {