From bf93c5d6a267f54335a90f64a03e00fc3dcbaa02 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 23 Oct 2025 21:02:14 -0400 Subject: [PATCH 1/3] tsk-80: Removing unused serde references --- src/managers/action_managers.rs | 4 +--- src/managers/commit_manager.rs | 4 +--- src/managers/user_manager.rs | 4 +--- src/models/api.rs | 3 +-- src/models/flags.rs | 3 +-- src/models/icarus_action.rs | 5 ++--- 6 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/managers/action_managers.rs b/src/managers/action_managers.rs index 2718401..6de2411 100644 --- a/src/managers/action_managers.rs +++ b/src/managers/action_managers.rs @@ -1,8 +1,6 @@ -use serde::{Deserialize, Serialize}; - use crate::{models, utilities}; -#[derive(Debug, Deserialize, Serialize)] +#[derive(Debug)] pub struct ActionManager { pub action: String, pub flags: Vec, diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 6b937e6..c0781d7 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -4,15 +4,13 @@ use std::fs::read_dir; use std::io::{Result, Write}; use std::str::FromStr; -use serde::{Deserialize, Serialize}; - use crate::managers; use crate::models::{self}; use crate::parsers; use crate::syncers; use crate::utilities; -#[derive(Debug, Deserialize, Serialize)] +#[derive(Debug)] pub struct CommitManager { pub ica_action: models::icarus_action::IcarusAction, } diff --git a/src/managers/user_manager.rs b/src/managers/user_manager.rs index d393eac..ee49159 100644 --- a/src/managers/user_manager.rs +++ b/src/managers/user_manager.rs @@ -1,10 +1,8 @@ use std::default::Default; -use serde::{Deserialize, Serialize}; - use crate::models::{self}; -#[derive(Debug, Default, Deserialize, Serialize)] +#[derive(Debug, Default)] pub struct UserManager { pub user: icarus_models::user::User, pub ica_action: models::icarus_action::IcarusAction, diff --git a/src/models/api.rs b/src/models/api.rs index 6f64ddd..9fea79f 100644 --- a/src/models/api.rs +++ b/src/models/api.rs @@ -1,8 +1,7 @@ use std::default::Default; -use serde::{Deserialize, Serialize}; -#[derive(Clone, Debug, Default, Deserialize, Serialize)] +#[derive(Clone, Debug, Default)] pub struct Api { pub url: String, pub endpoint: String, diff --git a/src/models/flags.rs b/src/models/flags.rs index 7258812..b5476ef 100644 --- a/src/models/flags.rs +++ b/src/models/flags.rs @@ -1,8 +1,7 @@ use std::default::Default; -use serde::{Deserialize, Serialize}; -#[derive(Clone, Debug, Default, Deserialize, Serialize)] +#[derive(Clone, Debug, Default)] pub struct Flags { pub flag: String, pub value: String, diff --git a/src/models/icarus_action.rs b/src/models/icarus_action.rs index 3de451b..a2b212f 100644 --- a/src/models/icarus_action.rs +++ b/src/models/icarus_action.rs @@ -1,10 +1,9 @@ use std::default::Default; -use serde::{Deserialize, Serialize}; - use crate::models; -#[derive(Clone, Debug, Default, Deserialize, Serialize)] + +#[derive(Clone, Debug, Default)] pub struct IcarusAction { pub action: String, pub flags: Vec, -- 2.47.3 From ee190e81a6eab7c5359882c411399720c29de28f Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 23 Oct 2025 21:03:59 -0400 Subject: [PATCH 2/3] tsk-80: Version bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 37d5181..061ddc0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -451,7 +451,7 @@ dependencies = [ [[package]] name = "icarus-dm" -version = "0.8.5" +version = "0.8.6" dependencies = [ "futures", "http", diff --git a/Cargo.toml b/Cargo.toml index c4c8752..9c098c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus-dm" -version = "0.8.5" +version = "0.8.6" rust-version = "1.90" edition = "2024" -- 2.47.3 From 973b9b2c156510bfa5ac1a3e4038bc01589c464e Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 23 Oct 2025 21:04:26 -0400 Subject: [PATCH 3/3] tsk-80: Formatting code --- src/models/api.rs | 1 - src/models/flags.rs | 1 - src/models/icarus_action.rs | 1 - src/utilities/string.rs | 20 ++++++-------------- 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/src/models/api.rs b/src/models/api.rs index 9fea79f..ff88f16 100644 --- a/src/models/api.rs +++ b/src/models/api.rs @@ -1,6 +1,5 @@ use std::default::Default; - #[derive(Clone, Debug, Default)] pub struct Api { pub url: String, diff --git a/src/models/flags.rs b/src/models/flags.rs index b5476ef..7aa0d0b 100644 --- a/src/models/flags.rs +++ b/src/models/flags.rs @@ -1,6 +1,5 @@ use std::default::Default; - #[derive(Clone, Debug, Default)] pub struct Flags { pub flag: String, diff --git a/src/models/icarus_action.rs b/src/models/icarus_action.rs index a2b212f..f1897ba 100644 --- a/src/models/icarus_action.rs +++ b/src/models/icarus_action.rs @@ -2,7 +2,6 @@ use std::default::Default; use crate::models; - #[derive(Clone, Debug, Default)] pub struct IcarusAction { pub action: String, diff --git a/src/utilities/string.rs b/src/utilities/string.rs index 5b18625..e58ec73 100644 --- a/src/utilities/string.rs +++ b/src/utilities/string.rs @@ -2,19 +2,11 @@ pub fn o_to_string(val: &std::ffi::OsString) -> Result Ok(value), Err(err) => match err.into_string() { - Ok(res) => { - Err(std::io::Error::other(res.to_string())) - } - Err(err) => { - match err.to_str() { - Some(err) => { - Err(std::io::Error::other(err)) - } - None => { - Err(std::io::Error::other("Undefined error")) - } - } - } - } + Ok(res) => Err(std::io::Error::other(res.to_string())), + Err(err) => match err.to_str() { + Some(err) => Err(std::io::Error::other(err)), + None => Err(std::io::Error::other("Undefined error")), + }, + }, } } -- 2.47.3