Don't use strum_macros directly (Peternator7/strum#362)

Author: object-Object

Cargo.lock

@@ -30,8 +30,7 @@ postcard = "1.1.3"
 rapidhash = { version = "3.1.0", default-features = false }
 replace_with = { version = "0.1.8", default-features = false }
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
-strum = { version = "0.27.2", default-features = false }
-strum_macros = "0.27.2"
+strum = { version = "0.27.2", default-features = false, features = ["derive"] }
 thiserror = { version = "2.0.12", default-features = false }
 widestring = { version = "1.2.0", default-features = false, features = ["alloc"] }
 

Cargo.toml

@@ -12,7 +12,7 @@ use mindustry_rs::{
         },
     },
 };
-use strum_macros::EnumString;
+use strum::EnumString;
 use widestring::U16String;
 
 #[derive(Parser)]
@@ -43,7 +43,7 @@ fn time_delta_parser(s: &str) -> Result<f64, String> {
 }
 
 #[allow(clippy::enum_variant_names)]
-#[derive(Debug, Clone, Copy, EnumString, strum_macros::Display)]
+#[derive(Debug, Clone, Copy, EnumString, strum::Display)]
 #[strum(serialize_all = "lowercase")]
 enum ProcessorType {
     Micro,

src/bin/mlog.rs

@@ -6,8 +6,7 @@ use core::hash::Hash;
 use binrw::prelude::*;
 use lazy_static::lazy_static;
 use serde::{Deserialize, Serialize};
-use strum::VariantArray;
-use strum_macros::{AsRefStr, IntoStaticStr, VariantArray};
+use strum::{AsRefStr, IntoStaticStr, VariantArray};
 use widestring::{U16Str, U16String};
 
 use super::colors;
@@ -54,7 +53,7 @@ pub enum ContentType {
     AsRefStr,
     IntoStaticStr,
     VariantArray,
-    strum_macros::Display,
+    strum::Display,
     Deserialize,
     Serialize,
 )]

src/types/enums.rs

@@ -2,7 +2,7 @@ use alloc::{boxed::Box, rc::Rc, string::ToString};
 use core::cell::RefCell;
 
 use derivative::Derivative;
-use strum_macros::IntoStaticStr;
+use strum::IntoStaticStr;
 use widestring::U16String;
 
 use super::{