From 2c91e99a4df7af9b7444172ae96f0d5bc1d1fcd0 Mon Sep 17 00:00:00 2001 From: Patrick Michl Date: Mon, 25 Apr 2022 22:03:25 +0200 Subject: [PATCH] fmt: cleanup & cargo fmt --- src/api/client_server/errors/api_error.rs | 6 +++--- src/api/client_server/mod.rs | 2 +- src/main.rs | 12 ++++++------ src/types/mod.rs | 2 +- src/types/{matrix_user_id.rs => user_id.rs} | 0 5 files changed, 11 insertions(+), 11 deletions(-) rename src/types/{matrix_user_id.rs => user_id.rs} (100%) diff --git a/src/api/client_server/errors/api_error.rs b/src/api/client_server/errors/api_error.rs index 2949ae4..a665a05 100644 --- a/src/api/client_server/errors/api_error.rs +++ b/src/api/client_server/errors/api_error.rs @@ -67,14 +67,14 @@ impl IntoResponse for ApiError { StatusCode::UNAUTHORIZED, Json(RegistrationResponse::user_interactive_authorization_info()), ).into_response(), - RegistrationError::InvalidUserId => (StatusCode::OK, Json( - ErrorResponse::new( + RegistrationError::InvalidUserId | RegistrationError::MissingUserId => ( + StatusCode::BAD_REQUEST, + Json(ErrorResponse::new( ErrorCode::InvalidUsername, ®istration_error.to_string(), None, ) )).into_response(), - RegistrationError::MissingUserId => (StatusCode::OK, String::new()).into_response(), RegistrationError::UserIdTaken => ( StatusCode::BAD_REQUEST, Json(ErrorResponse::new( diff --git a/src/api/client_server/mod.rs b/src/api/client_server/mod.rs index d0d0efd..1840809 100644 --- a/src/api/client_server/mod.rs +++ b/src/api/client_server/mod.rs @@ -1,3 +1,3 @@ pub mod auth; -pub mod versions; pub mod errors; +pub mod versions; diff --git a/src/main.rs b/src/main.rs index f5257ee..650d1f6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -35,18 +35,16 @@ impl Default for Config { } #[tokio::main] -async fn main() { +async fn main() -> anyhow::Result<()> { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "debug"); } - + tracing_subscriber::fmt::init(); let config = Arc::new(Config::default()); - let pool = sqlx::SqlitePool::connect(&config.db_path) - .await - .unwrap(); + let pool = sqlx::SqlitePool::connect(&config.db_path).await?; let cors = CorsLayer::new() .allow_origin(tower_http::cors::Any) @@ -69,7 +67,9 @@ async fn main() { let _ = axum::Server::bind(&"127.0.0.1:3000".parse().unwrap()) .serve(router.into_make_service()) - .await; + .await?; + + Ok(()) } async fn fallback(request: Request) -> StatusCode { diff --git a/src/types/mod.rs b/src/types/mod.rs index 9d4c82d..e6d839d 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -1,7 +1,7 @@ pub mod authentication_data; +pub mod error_code; pub mod flow; pub mod identifier; pub mod identifier_type; pub mod matrix_user_id; pub mod user_interactive_authorization; -pub mod error_code; \ No newline at end of file diff --git a/src/types/matrix_user_id.rs b/src/types/user_id.rs similarity index 100% rename from src/types/matrix_user_id.rs rename to src/types/user_id.rs