Moving code to init module
All checks were successful
Rust Build / Check (pull_request) Successful in 28s
Rust Build / Test Suite (pull_request) Successful in 30s
Rust Build / Rustfmt (pull_request) Successful in 29s
Rust Build / Clippy (pull_request) Successful in 27s
Rust Build / build (pull_request) Successful in 28s
All checks were successful
Rust Build / Check (pull_request) Successful in 28s
Rust Build / Test Suite (pull_request) Successful in 30s
Rust Build / Rustfmt (pull_request) Successful in 29s
Rust Build / Clippy (pull_request) Successful in 27s
Rust Build / build (pull_request) Successful in 28s
This commit is contained in:
10
src/lib.rs
10
src/lib.rs
@@ -7,3 +7,13 @@ pub mod song;
|
|||||||
pub mod token;
|
pub mod token;
|
||||||
pub mod types;
|
pub mod types;
|
||||||
pub mod user;
|
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()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
12
src/user.rs
12
src/user.rs
@@ -1,10 +1,12 @@
|
|||||||
use std::default::Default;
|
use std::default::Default;
|
||||||
|
|
||||||
|
use crate::init;
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
||||||
pub struct User {
|
pub struct User {
|
||||||
#[serde(skip_serializing_if = "is_uuid_nil")]
|
#[serde(skip_serializing_if = "init::is_uuid_nil")]
|
||||||
pub id: uuid::Uuid,
|
pub id: uuid::Uuid,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
pub username: String,
|
pub username: String,
|
||||||
@@ -27,14 +29,6 @@ pub struct User {
|
|||||||
pub last_login: String,
|
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 {
|
impl Default for User {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
User {
|
User {
|
||||||
|
Reference in New Issue
Block a user