diff --git a/Cargo.lock b/Cargo.lock index 5eacd742..f2438757 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1277,7 +1277,6 @@ dependencies = [ "simplelog", "snap", "strum", - "strum_macros", "tempfile", "test-log", "tokio", @@ -1315,7 +1314,6 @@ dependencies = [ "shellexpand", "snap", "strum", - "strum_macros", "tempfile", "thiserror", "tokio", @@ -1774,6 +1772,9 @@ name = "strum" version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] [[package]] name = "strum_macros" diff --git a/Cargo.toml b/Cargo.toml index a545278f..5c724359 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_yaml = "0.9" snap = "1.1" -strum = "0.26" -strum_macros = "0.26" +strum = { version = "0.26", features = ["derive"] } tokio = { version = "1.36", features = ["rt-multi-thread", "time", "io-std"] } handlebars = "5.1" anyhow = "1" diff --git a/pueue/Cargo.toml b/pueue/Cargo.toml index f2681826..a7683fb9 100644 --- a/pueue/Cargo.toml +++ b/pueue/Cargo.toml @@ -35,7 +35,6 @@ shell-escape = "0.1" simplelog = "0.12" snap.workspace = true strum.workspace = true -strum_macros.workspace = true tempfile = "3" tokio.workspace = true diff --git a/pueue/src/client/commands/wait.rs b/pueue/src/client/commands/wait.rs index a1aeddb3..5be63f57 100644 --- a/pueue/src/client/commands/wait.rs +++ b/pueue/src/client/commands/wait.rs @@ -6,7 +6,7 @@ use chrono::Local; use crossterm::style::{Attribute, Color}; use pueue_lib::network::message::TaskSelection; use pueue_lib::state::State; -use strum_macros::{Display, EnumString}; +use strum::{Display, EnumString}; use tokio::time::sleep; use pueue_lib::network::protocol::GenericStream; diff --git a/pueue_lib/Cargo.toml b/pueue_lib/Cargo.toml index 59149668..480cecd0 100644 --- a/pueue_lib/Cargo.toml +++ b/pueue_lib/Cargo.toml @@ -40,7 +40,6 @@ serde_yaml = "0.9" shellexpand = "3.1" snap.workspace = true strum.workspace = true -strum_macros.workspace = true thiserror = "1.0" tokio = { workspace = true, features = ["macros", "net", "io-util"] } tokio-rustls = { version = "0.26", default-features = false } diff --git a/pueue_lib/src/network/message.rs b/pueue_lib/src/network/message.rs index 0eb9b600..ffa5a281 100644 --- a/pueue_lib/src/network/message.rs +++ b/pueue_lib/src/network/message.rs @@ -3,7 +3,7 @@ use std::path::PathBuf; use chrono::prelude::*; use serde::{Deserialize, Serialize}; -use strum_macros::{Display, EnumString}; +use strum::{Display, EnumString}; use crate::state::{Group, State}; use crate::task::Task; diff --git a/pueue_lib/src/task.rs b/pueue_lib/src/task.rs index 5efcd40c..f4176d9e 100644 --- a/pueue_lib/src/task.rs +++ b/pueue_lib/src/task.rs @@ -2,7 +2,7 @@ use std::{collections::HashMap, path::PathBuf}; use chrono::prelude::*; use serde::{Deserialize, Serialize}; -use strum_macros::Display; +use strum::Display; use crate::state::PUEUE_DEFAULT_GROUP;