From fa6350c9216c05a25a60c1ee0e5938a881519a12 Mon Sep 17 00:00:00 2001 From: phoenix Date: Thu, 3 Apr 2025 21:30:46 -0400 Subject: [PATCH] Moving code to init module --- src/lib.rs | 10 ++++++++++ src/user.rs | 12 +++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 43c2c79..7ae0952 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,3 +7,13 @@ pub mod song; pub mod token; pub mod types; pub mod user; + +pub mod init { + pub fn is_id_valid(num: &i32) -> bool { + *num > 0 + } + + pub fn is_uuid_nil(uuid: &uuid::Uuid) -> bool { + uuid.is_nil() + } +} diff --git a/src/user.rs b/src/user.rs index 8a34ca4..6efeb3c 100644 --- a/src/user.rs +++ b/src/user.rs @@ -1,10 +1,12 @@ use std::default::Default; +use crate::init; + use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, Deserialize, Serialize)] pub struct User { - #[serde(skip_serializing_if = "is_uuid_nil")] + #[serde(skip_serializing_if = "init::is_uuid_nil")] pub id: uuid::Uuid, #[serde(skip_serializing_if = "String::is_empty")] pub username: String, @@ -27,14 +29,6 @@ pub struct User { pub last_login: String, } -fn is_id_valid(num: &i32) -> bool { - *num > 0 -} - -fn is_uuid_nil(uuid: &uuid::Uuid) -> bool { - uuid.is_nil() -} - impl Default for User { fn default() -> Self { User {