From b79db6029eda43b9f703b48d5332d639c5cad588 Mon Sep 17 00:00:00 2001 From: Joey Hines Date: Sun, 24 Oct 2021 13:21:30 -0600 Subject: [PATCH] Fmt + Clippy --- geoffrey_api/src/commands/add_location.rs | 2 +- geoffrey_api/src/commands/mod.rs | 30 ++++++++----------- geoffrey_api/src/commands/register.rs | 10 ++++--- geoffrey_api/src/helper/mod.rs | 2 +- .../models/parameters/add_location_params.rs | 4 +-- .../src/models/parameters/find_params.rs | 2 +- geoffrey_models/src/models/parameters/mod.rs | 4 +-- .../src/models/parameters/register_params.rs | 2 +- 8 files changed, 26 insertions(+), 30 deletions(-) diff --git a/geoffrey_api/src/commands/add_location.rs b/geoffrey_api/src/commands/add_location.rs index d6fe6aa..86bc74f 100644 --- a/geoffrey_api/src/commands/add_location.rs +++ b/geoffrey_api/src/commands/add_location.rs @@ -4,9 +4,9 @@ use crate::Result; use geoffrey_db::helper::load_location; use geoffrey_models::models::locations::{Location, LocationDb}; use geoffrey_models::models::parameters::add_location_params::AddLocationParams; +use geoffrey_models::models::player::Player; use geoffrey_models::models::CommandLevel; use std::sync::Arc; -use geoffrey_models::models::player::Player; pub struct AddLocation {} diff --git a/geoffrey_api/src/commands/mod.rs b/geoffrey_api/src/commands/mod.rs index e95d27f..187829c 100644 --- a/geoffrey_api/src/commands/mod.rs +++ b/geoffrey_api/src/commands/mod.rs @@ -2,7 +2,11 @@ use crate::commands::add_location::AddLocation; use crate::commands::find::FindCommand; use crate::commands::register::Register; use crate::context::Context; +use crate::helper::get_player_from_req; use crate::Result; +use geoffrey_models::models::parameters::CommandRequest; +use geoffrey_models::models::player::Player; +use geoffrey_models::models::response::api_error::GeoffreyAPIError; use geoffrey_models::models::response::APIResponse; use geoffrey_models::models::CommandLevel; use serde::de::DeserializeOwned; @@ -11,11 +15,6 @@ use std::fmt::Debug; use std::sync::Arc; use warp::filters::BoxedFilter; use warp::Filter; -use geoffrey_models::models::player::Player; -use crate::helper::get_player_from_req; -use geoffrey_models::models::response::api_error::GeoffreyAPIError; -use geoffrey_models::models::parameters::CommandRequest; - pub mod add_location; pub mod find; @@ -40,19 +39,14 @@ pub trait Command { fn user_is_authorized(user: &Option) -> Result<()> { if Self::command_level() == CommandLevel::ALL { Ok(()) - } - else { - if let Some(user) = user { - if user.auth_level >= Self::command_level() { - Ok(()) - } - else { - Err(GeoffreyAPIError::PermissionInsufficient) - } - } - else { - Err(GeoffreyAPIError::PlayerNotRegistered) + } else if let Some(user) = user { + if user.auth_level >= Self::command_level() { + Ok(()) + } else { + Err(GeoffreyAPIError::PermissionInsufficient) } + } else { + Err(GeoffreyAPIError::PlayerNotRegistered) } } } @@ -65,7 +59,7 @@ pub fn handle_command(ctx: Arc, req: T::Req) -> Result T::run_command(ctx, req, user), - Err(e) => Err(e) + Err(e) => Err(e), } } diff --git a/geoffrey_api/src/commands/register.rs b/geoffrey_api/src/commands/register.rs index 5ddb3f0..600136c 100644 --- a/geoffrey_api/src/commands/register.rs +++ b/geoffrey_api/src/commands/register.rs @@ -24,11 +24,13 @@ impl Command for Register { CommandLevel::ALL } - fn run_command(ctx: Arc, req: Self::Req, _: Option) -> crate::Result { + fn run_command( + ctx: Arc, + req: Self::Req, + _: Option, + ) -> crate::Result { let player = Player::new(req.username.as_str(), req.new_user_id); - ctx.db - .insert(player) - .map_err(GeoffreyAPIError::from) + ctx.db.insert(player).map_err(GeoffreyAPIError::from) } } diff --git a/geoffrey_api/src/helper/mod.rs b/geoffrey_api/src/helper/mod.rs index a7e58c2..e43580c 100644 --- a/geoffrey_api/src/helper/mod.rs +++ b/geoffrey_api/src/helper/mod.rs @@ -11,4 +11,4 @@ pub fn get_player_from_req(db: &Database, req: &T) -> Result< } else { Ok(None) } -} \ No newline at end of file +} diff --git a/geoffrey_models/src/models/parameters/add_location_params.rs b/geoffrey_models/src/models/parameters/add_location_params.rs index 4a0f67a..731911c 100644 --- a/geoffrey_models/src/models/parameters/add_location_params.rs +++ b/geoffrey_models/src/models/parameters/add_location_params.rs @@ -1,8 +1,8 @@ use crate::models::locations::LocationType; +use crate::models::parameters::CommandRequest; +use crate::models::player::UserID; use crate::models::{Position, Tunnel}; use serde::{Deserialize, Serialize}; -use crate::models::player::UserID; -use crate::models::parameters::CommandRequest; #[derive(Debug, Serialize, Deserialize, Clone)] pub struct AddLocationParams { diff --git a/geoffrey_models/src/models/parameters/find_params.rs b/geoffrey_models/src/models/parameters/find_params.rs index 9ee87f4..d873017 100644 --- a/geoffrey_models/src/models/parameters/find_params.rs +++ b/geoffrey_models/src/models/parameters/find_params.rs @@ -1,5 +1,5 @@ -use serde::{Deserialize, Serialize}; use crate::models::parameters::CommandRequest; +use serde::{Deserialize, Serialize}; #[derive(Debug, Serialize, Deserialize, Clone)] pub struct FindParams { diff --git a/geoffrey_models/src/models/parameters/mod.rs b/geoffrey_models/src/models/parameters/mod.rs index e688488..1ef316c 100644 --- a/geoffrey_models/src/models/parameters/mod.rs +++ b/geoffrey_models/src/models/parameters/mod.rs @@ -5,9 +5,9 @@ pub mod register_params; use crate::models::player::{Player, UserID}; use crate::models::token::{Permissions, Token}; use crate::models::CommandLevel; +use serde::de::DeserializeOwned; use serde::Serialize; use std::fmt::Debug; -use serde::de::DeserializeOwned; pub trait CommandRequest: Serialize + DeserializeOwned + Debug + Clone + Send + 'static { fn token(&self) -> u64; @@ -31,4 +31,4 @@ pub trait CommandRequest: Serialize + DeserializeOwned + Debug + Clone + Send + false } } -} \ No newline at end of file +} diff --git a/geoffrey_models/src/models/parameters/register_params.rs b/geoffrey_models/src/models/parameters/register_params.rs index eef4b5d..2d83369 100644 --- a/geoffrey_models/src/models/parameters/register_params.rs +++ b/geoffrey_models/src/models/parameters/register_params.rs @@ -1,6 +1,6 @@ +use crate::models::parameters::CommandRequest; use crate::models::player::UserID; use serde::{Deserialize, Serialize}; -use crate::models::parameters::CommandRequest; #[derive(Debug, Serialize, Deserialize, Clone)] pub struct RegisterParameters {