From 428db6b23a75b62c98e9539a8b29311d16fc98a1 Mon Sep 17 00:00:00 2001 From: Kyattsukuro Date: Sat, 29 Nov 2025 19:40:36 +0100 Subject: [PATCH] pass formatting checks --- src/api/admin.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/api/admin.rs b/src/api/admin.rs index b428759f..a0f2b9e9 100644 --- a/src/api/admin.rs +++ b/src/api/admin.rs @@ -25,7 +25,7 @@ use crate::{ ACTIVE_DB_TYPE, DbConn, DbConnType, backup_sqlite, get_sql_server_version, models::{ Attachment, Cipher, Collection, Device, Event, EventType, Group, Invitation, Membership, MembershipId, - MembershipType, OrgPolicy, Organization, OrganizationId, SsoUser, TwoFactor, User, UserId + MembershipType, OrgPolicy, Organization, OrganizationId, SsoUser, TwoFactor, User, UserId, }, }, error::{Error, MapResult}, @@ -351,7 +351,7 @@ fn logout(cookies: &CookieJar<'_>) -> Redirect { Redirect::to(admin_path()) } -async fn get_users_property(users: Vec<(User, Option)>, conn: &DbConn) -> Vec { +async fn get_users_property(users: Vec<(User, Option)>, conn: &DbConn) -> Vec { let mut users_json = Vec::with_capacity(users.len()); for (u, sso_u) in users { let mut usr = u.to_json(conn).await; @@ -369,7 +369,7 @@ async fn get_users_property(users: Vec<(User, Option)>, conn: &DbConn) users_json.push(usr); } - return users_json + users_json } #[get("/users")] @@ -379,7 +379,6 @@ async fn get_users_json(_token: AdminToken, conn: DbConn) -> Json { Json(Value::Array(users_json)) } - #[get("/users/overview")] async fn users_overview(_token: AdminToken, conn: DbConn) -> ApiResult> { let users = User::get_all(&conn).await; @@ -391,7 +390,7 @@ async fn users_overview(_token: AdminToken, conn: DbConn) -> ApiResult")] async fn get_user_by_mail_json(mail: &str, _token: AdminToken, conn: DbConn) -> JsonResult { if let Some((u, sso)) = SsoUser::find_by_mail(mail, &conn).await { - let user_json = get_users_property(vec!((u, sso)), &conn).await[0].clone(); + let user_json = get_users_property(vec![(u, sso)], &conn).await[0].clone(); Ok(Json(user_json)) } else { err_code!("User doesn't exist", Status::NotFound.code); @@ -401,7 +400,7 @@ async fn get_user_by_mail_json(mail: &str, _token: AdminToken, conn: DbConn) -> #[get("/users/")] async fn get_user_json(user_id: UserId, _token: AdminToken, conn: DbConn) -> JsonResult { let u_sso = get_user_or_404(&user_id, &conn).await?; - let user_json = get_users_property(vec!(u_sso), &conn).await[0].clone(); + let user_json = get_users_property(vec![u_sso], &conn).await[0].clone(); Ok(Json(user_json)) }