From 61d2e9ea81c03174097cad9ac98583f7de03d9ac Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Mon, 21 Sep 2026 22:10:21 +0200 Subject: [PATCH] Fixed clippy warnings. --- server/src/error.rs | 6 +++--- server/src/routes/dtos/expense.rs | 22 +++++++++------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/server/src/error.rs b/server/src/error.rs index 8359c00..b79de4a 100644 --- a/server/src/error.rs +++ b/server/src/error.rs @@ -8,7 +8,7 @@ use crate::routes::dtos::expense::RecurringExpenseConversionError; #[derive(Debug)] pub enum AppError { Database(sqlx::Error), - InvalidRecurringExpense(RecurringExpenseConversionError), + RecurringExpense(RecurringExpenseConversionError), } impl From for AppError { @@ -19,7 +19,7 @@ impl From for AppError { impl From for AppError { fn from(error: RecurringExpenseConversionError) -> Self { - Self::InvalidRecurringExpense(error) + Self::RecurringExpense(error) } } @@ -27,7 +27,7 @@ impl IntoResponse for AppError { fn into_response(self) -> Response { match self { Self::Database(error) => tracing::error!(%error, "Database query failed"), - Self::InvalidRecurringExpense(error) => { + Self::RecurringExpense(error) => { tracing::error!(%error, "Invalid recurring expense data") } } diff --git a/server/src/routes/dtos/expense.rs b/server/src/routes/dtos/expense.rs index 7f4a5a8..29d93ba 100644 --- a/server/src/routes/dtos/expense.rs +++ b/server/src/routes/dtos/expense.rs @@ -46,9 +46,9 @@ pub enum WeekendAdjustment { #[derive(Debug)] pub enum RecurringExpenseConversionError { - InvalidRecurrenceEvery(i32), - InvalidRecurrenceUnit(String), - InvalidWeekendAdjustment(String), + RecurrenceEvery(i32), + RecurrenceUnit(String), + WeekendAdjustment(String), } impl From for Expense { @@ -60,13 +60,13 @@ impl From for Expense { impl std::fmt::Display for RecurringExpenseConversionError { fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { - Self::InvalidRecurrenceEvery(value) => { + Self::RecurrenceEvery(value) => { write!(formatter, "invalid recurrence_every value: {value}") } - Self::InvalidRecurrenceUnit(value) => { + Self::RecurrenceUnit(value) => { write!(formatter, "invalid recurrence_unit value: {value}") } - Self::InvalidWeekendAdjustment(value) => { + Self::WeekendAdjustment(value) => { write!(formatter, "invalid weekend_adjustment value: {value}") } } @@ -87,7 +87,7 @@ impl TryFrom for RecurringExpense { end: row.ends_at, recurrence: Recurrence { every: row.recurrence_every.try_into().map_err(|_| { - RecurringExpenseConversionError::InvalidRecurrenceEvery(row.recurrence_every) + RecurringExpenseConversionError::RecurrenceEvery(row.recurrence_every) })?, unit: RecurrenceUnit::try_from(row.recurrence_unit)?, weekend_adjustment: match row.weekend_adjustment { @@ -108,9 +108,7 @@ impl TryFrom for RecurrenceUnit { "week" => Ok(Self::Week), "month" => Ok(Self::Month), "year" => Ok(Self::Year), - _ => Err(RecurringExpenseConversionError::InvalidRecurrenceUnit( - value, - )), + _ => Err(RecurringExpenseConversionError::RecurrenceUnit(value)), } } } @@ -122,9 +120,7 @@ impl TryFrom for WeekendAdjustment { match value.as_str() { "previous_business_day" => Ok(Self::PreviousBusinessDay), "next_business_day" => Ok(Self::NextBusinessDay), - _ => Err(RecurringExpenseConversionError::InvalidWeekendAdjustment( - value, - )), + _ => Err(RecurringExpenseConversionError::WeekendAdjustment(value)), } } }