aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoris2025-02-07 10:49:24 +0100
committerJoris2025-02-07 10:49:24 +0100
commita217f4c75def40889710cfcf776ff827745fb6ff (patch)
tree837d4175b7786284a89d1cc41df518e23c8bc0b0 /src
parent99fe1002c5961dcf5063b7ed51a9dfc426f96ace (diff)
Use &str instead of String in funcion params when possible
Diffstat (limited to 'src')
-rw-r--r--src/db/event-color.rs7
-rw-r--r--src/gui/form/mod.rs8
-rw-r--r--src/gui/form/repetition.rs2
-rw-r--r--src/model/event.rs10
-rw-r--r--src/validation/mod.rs4
5 files changed, 12 insertions, 19 deletions
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<String> {
-}
-
-// 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<Repetition>,
category: Option<Uuid>,
) -> Option<Event> {
@@ -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<Option<NaiveTime>> {
+pub fn time(time: &str) -> Option<Option<NaiveTime>> {
let time = time.trim();
if time.is_empty() {
Some(None)
@@ -11,7 +11,7 @@ pub fn time(time: String) -> Option<Option<NaiveTime>> {
}
}
-pub fn non_empty(str: String) -> Option<String> {
+pub fn non_empty(str: &str) -> Option<String> {
let str = str.trim();
if str.is_empty() {
None