From a217f4c75def40889710cfcf776ff827745fb6ff Mon Sep 17 00:00:00 2001 From: Joris Date: Fri, 7 Feb 2025 10:49:24 +0100 Subject: Use &str instead of String in funcion params when possible --- src/db/event-color.rs | 7 ------- src/gui/form/mod.rs | 8 ++++---- src/gui/form/repetition.rs | 2 +- src/model/event.rs | 10 +++++----- src/validation/mod.rs | 4 ++-- 5 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 src/db/event-color.rs diff --git a/src/db/event-color.rs b/src/db/event-color.rs deleted file mode 100644 index 18612e4..0000000 --- a/src/db/event-color.rs +++ /dev/null @@ -1,7 +0,0 @@ - - -pub fn get_default_color(conn: &Connection) -> Result { -} - -// pub fn set_default_color(conon: &Connection, color: &str) -> Result<()> { -// } diff --git a/src/gui/form/mod.rs b/src/gui/form/mod.rs index 197bc14..a14fb82 100644 --- a/src/gui/form/mod.rs +++ b/src/gui/form/mod.rs @@ -256,10 +256,10 @@ pub async fn show(app: &App, target: Target) { match event::validate( id, - date.buffer().text().to_string(), - name.buffer().text().to_string(), - start.buffer().text().to_string(), - end.buffer().text().to_string(), + &date.buffer().text(), + &name.buffer().text(), + &start.buffer().text(), + &end.buffer().text(), repetition, category, ) { diff --git a/src/gui/form/repetition.rs b/src/gui/form/repetition.rs index 4ed9803..6e7a13f 100644 --- a/src/gui/form/repetition.rs +++ b/src/gui/form/repetition.rs @@ -195,7 +195,7 @@ pub fn validate( // Check until let until = (if frequency.is_some() { - match validation::non_empty(model.until.buffer().text().to_string()) { + match validation::non_empty(&model.until.buffer().text()) { Some(until) => match NaiveDate::parse_from_str(&until, event::DATE_FORMAT) { Ok(until) => Ok(Some(until)), Err(_) => Err(format!("Can’t parse date from {}", until)), diff --git a/src/model/event.rs b/src/model/event.rs index 98ce416..62e5b12 100644 --- a/src/model/event.rs +++ b/src/model/event.rs @@ -65,10 +65,10 @@ pub fn repetitions_between( pub fn validate( id: Uuid, - date: String, - name: String, - start: String, - end: String, + date: &str, + name: &str, + start: &str, + end: &str, repetition: Option, category: Option, ) -> Option { @@ -82,7 +82,7 @@ pub fn validate( Some(Event { id, - date: NaiveDate::parse_from_str(&date, DATE_FORMAT).ok()?, + date: NaiveDate::parse_from_str(date, DATE_FORMAT).ok()?, name: validation::non_empty(name)?, start, end, diff --git a/src/validation/mod.rs b/src/validation/mod.rs index 07a7c4c..029726d 100644 --- a/src/validation/mod.rs +++ b/src/validation/mod.rs @@ -2,7 +2,7 @@ use chrono::NaiveTime; use crate::model::time; -pub fn time(time: String) -> Option> { +pub fn time(time: &str) -> Option> { let time = time.trim(); if time.is_empty() { Some(None) @@ -11,7 +11,7 @@ pub fn time(time: String) -> Option> { } } -pub fn non_empty(str: String) -> Option { +pub fn non_empty(str: &str) -> Option { let str = str.trim(); if str.is_empty() { None -- cgit v1.2.3