chore(deps): Combine strum and strum_macros

Nukesor · Nov 6, 2024 · 420306d · 420306d
1 parent 9c79092
commit 420306d
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;