diff --git a/rust/src/error.rs b/rust/src/error.rs index 7067feb..99747bf 100644 --- a/rust/src/error.rs +++ b/rust/src/error.rs @@ -92,7 +92,7 @@ impl IntoResponse for Error { ), models::Error::Query(error) => match error { models::QueryError::NotFound { description } => { - (StatusCode::NOT_FOUND, view::ErrorPage::build(&description)) + (StatusCode::NOT_FOUND, view::ErrorPage::build(description)) } _ => ( StatusCode::BAD_REQUEST, diff --git a/rust/src/lib.rs b/rust/src/lib.rs index ee3dec8..b1cd7bc 100644 --- a/rust/src/lib.rs +++ b/rust/src/lib.rs @@ -64,9 +64,9 @@ impl fmt::Display for UriPath { } } -impl<'a> Into<&'a str> for &'a UriPath { - fn into(self) -> &'a str { - self.0.as_str() +impl<'a> From<&'a UriPath> for &'a str { + fn from(val: &'a UriPath) -> Self { + val.0.as_str() } } diff --git a/rust/src/models/error.rs b/rust/src/models/error.rs index 99cd195..f962b58 100644 --- a/rust/src/models/error.rs +++ b/rust/src/models/error.rs @@ -118,16 +118,16 @@ impl From for Error { match &*code { // SQLITE_CONSTRAINT_FOREIGNKEY "787" => Error::Query(QueryError::ReferenceNotFound { - description: format!("foreign key reference not found"), + description: "foreign key reference not found".to_string(), }), // SQLITE_CONSTRAINT_UNIQUE "2067" => Error::Query(QueryError::Duplicate { - description: format!("item with unique constraint already exists",), + description: "item with unique constraint already exists".to_string(), }), _ => Error::Database(DatabaseError::Sql { description: format!( "got error with unknown code: {}", - sqlite_error.to_string() + sqlite_error ), }), } @@ -135,13 +135,13 @@ impl From for Error { Error::Database(DatabaseError::Sql { description: format!( "got error without code: {}", - sqlite_error.to_string() + sqlite_error ), }) } } _ => Error::Database(DatabaseError::Sql { - description: format!("got unknown error: {}", value.to_string()), + description: format!("got unknown error: {}", value), }), } } diff --git a/rust/src/models/inventory.rs b/rust/src/models/inventory.rs index a383925..9b9f8ca 100644 --- a/rust/src/models/inventory.rs +++ b/rust/src/models/inventory.rs @@ -29,7 +29,7 @@ impl Inventory { .collect::, Error>>()?; for category in &mut categories { - category.populate_items(&ctx, &pool).await?; + category.populate_items(ctx, pool).await?; } Ok(Self { categories }) diff --git a/rust/src/routing/mod.rs b/rust/src/routing/mod.rs index be73801..1b597e9 100644 --- a/rust/src/routing/mod.rs +++ b/rust/src/routing/mod.rs @@ -13,7 +13,7 @@ mod html; mod routes; use routes::*; -fn get_referer<'a>(headers: &'a HeaderMap) -> Result<&'a str, Error> { +fn get_referer(headers: &HeaderMap) -> Result<&str, Error> { headers .get("referer") .ok_or(Error::Request(RequestError::RefererNotFound))? diff --git a/rust/src/routing/routes.rs b/rust/src/routing/routes.rs index 71c2f04..bda3295 100644 --- a/rust/src/routing/routes.rs +++ b/rust/src/routing/routes.rs @@ -113,14 +113,14 @@ pub async fn icon() -> impl IntoResponse { } pub async fn debug(headers: HeaderMap) -> impl IntoResponse { - let out = { + + { let mut out = String::new(); for (key, value) in headers.iter() { out.push_str(&format!("{}: {}\n", key, value.to_str().unwrap())); } out - }; - out + } } pub async fn inventory_active( Extension(current_user): Extension, @@ -452,12 +452,10 @@ pub async fn trip_edit_attribute( Form(trip_update): Form, ) -> Result { let ctx = Context::build(current_user); - if attribute == models::trips::TripAttribute::Name { - if trip_update.new_value.is_empty() { - return Err(Error::Request(RequestError::EmptyFormElement { - name: "name".to_string(), - })); - } + if attribute == models::trips::TripAttribute::Name && trip_update.new_value.is_empty() { + return Err(Error::Request(RequestError::EmptyFormElement { + name: "name".to_string(), + })); } models::trips::Trip::set_attribute( &ctx, @@ -479,7 +477,7 @@ pub async fn trip_item_set_state( key: models::trips::TripItemStateKey, value: bool, ) -> Result<(), Error> { - models::trips::TripItem::set_state(&ctx, &state.database_pool, trip_id, item_id, key, value) + models::trips::TripItem::set_state(ctx, &state.database_pool, trip_id, item_id, key, value) .await?; Ok(()) } @@ -502,7 +500,7 @@ pub async fn trip_row( trip_id, &item, models::inventory::InventoryItem::get_category_max_weight( - &ctx, + ctx, &state.database_pool, item.item.category_id, ) @@ -902,9 +900,9 @@ pub async fn trips_types_edit_name( .await?; if !exists { - return Err(Error::Request(RequestError::NotFound { + Err(Error::Request(RequestError::NotFound { message: format!("trip type with id {trip_type_id} not found"), - })); + })) } else { Ok(Redirect::to("/trips/types/")) }