remove all that .map_err nonsense at once

src/web/pages/users/create.rs

@@ -8,8 +8,8 @@ use maud::{PreEscaped, html};
 use serde::Deserialize;
 
 use crate::{
-    api::CompositeError,
-    database::{self, DatabaseError},
+    database::{self},
+    error::CompositeError,
     logs::{LogAction, LogEntry},
     users::{
         User,
@@ -73,8 +73,8 @@ pub async fn create_user(
     Form(form): Form<CreateUserWithPasswordForm>,
 ) -> Result<Response, CompositeError> {
     let u = User::authenticate(&headers)?.required()?;
-    let mut conn = database::conn().map_err(DatabaseError::from)?;
-    let tx = conn.transaction().map_err(DatabaseError::from)?;
+    let mut conn = database::conn()?;
+    let tx = conn.transaction()?;
 
     if !u.has_permission(&tx, Permission::ManuallyCreateUsers)? {
         return Ok((StatusCode::FORBIDDEN).into_response());
@@ -89,6 +89,6 @@ pub async fn create_user(
             handle: nu.handle.as_str().to_string(),
         },
     )?;
-    tx.commit().map_err(DatabaseError::from)?;
+    tx.commit()?;
     Ok(Redirect::to("/users").into_response())
 }