Update strum dependency

Zerthox · Feb 5, 2024 · 210a52a · 210a52a
1 parent eb5711e
commit 210a52a
Show file tree

Hide file tree

Showing 24 changed files with 53 additions and 53 deletions.
diff --git a/arcdps/Cargo.toml b/arcdps/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "arcdps"
-version = "0.13.0"
+version = "0.13.1"
 authors = ["Zerthox", "Greaka"]
 edition = "2021"
 description = "Rust bindings for ArcDPS plugins"
@@ -17,7 +17,7 @@ evtc = { path = "../evtc" }
 log = { version = "0.4.17", features = ["std"], optional = true }
 num_enum = "0.7.0"
 serde = { version = "1.0.160", features = ["derive"], optional = true }
-strum = { version = "0.25.0", features = ["derive"], optional = true }
+strum = { version = "0.26.1", features = ["derive"], optional = true }
 
 [dependencies.windows]
 version = "0.52.0"

diff --git a/arcdps/src/exports/mod.rs b/arcdps/src/exports/mod.rs
@@ -27,7 +27,7 @@ use windows::Win32::Foundation::HMODULE;
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// Retrieves the ArcDPS version as string.
 #[inline]
@@ -344,7 +344,7 @@ pub fn add_extension(handle: HMODULE) -> AddExtensionResult {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(u32)]
 pub enum AddExtensionResult {

diff --git a/arcdps/src/extras/keybinds.rs b/arcdps/src/extras/keybinds.rs
@@ -6,7 +6,7 @@ use num_enum::{IntoPrimitive, TryFromPrimitive};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// Keybind change event.
 #[derive(Debug, Clone)]
@@ -151,7 +151,7 @@ pub struct RawKeybind {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(i32)]
 #[allow(non_camel_case_types)]
@@ -365,7 +365,7 @@ pub enum Control {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(i32)]
 pub enum KeyCode {
@@ -516,7 +516,7 @@ pub enum KeyCode {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(i32)]
 pub enum MouseCode {
@@ -559,7 +559,7 @@ pub enum MouseCode {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(i32)]
 pub enum DeviceType {
@@ -576,7 +576,7 @@ pub enum DeviceType {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(i32)]
 pub enum Modifier {

diff --git a/arcdps/src/extras/message.rs b/arcdps/src/extras/message.rs
@@ -8,7 +8,7 @@ use std::os::raw::c_char;
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// A chat message.
 ///
@@ -196,7 +196,7 @@ pub struct RawChatMessageInfo {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(u8)]
 pub enum ChannelType {

diff --git a/arcdps/src/extras/user.rs b/arcdps/src/extras/user.rs
@@ -8,7 +8,7 @@ use std::{os::raw::c_char, slice};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// Role of a user in the squad.
 #[derive(
@@ -17,7 +17,7 @@ use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(u8)]
 pub enum UserRole {

diff --git a/evtc/Cargo.toml b/evtc/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/zerthox/arcdps-rs"
 memoffset = "0.9.0"
 num_enum = "0.7.0"
 serde = { version = "1.0.160", features = ["derive"], optional = true }
-strum = { version = "0.25.0", features = ["derive"], optional = true }
+strum = { version = "0.26.1", features = ["derive"], optional = true }
 
 [dev-dependencies]
 approx = "0.5.1"

diff --git a/evtc/src/agent/affinity.rs b/evtc/src/agent/affinity.rs
@@ -4,7 +4,7 @@ use num_enum::{FromPrimitive, IntoPrimitive};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// Whether the agent is an ally or enemy.
 ///
@@ -15,7 +15,7 @@ use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(u8)]
 pub enum Affinity {

diff --git a/evtc/src/agent/agent_kind.rs b/evtc/src/agent/agent_kind.rs
@@ -4,14 +4,14 @@ use std::mem::transmute;
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// Possible agent kinds.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 pub enum AgentKind {
     /// Agent is a player.

diff --git a/evtc/src/agent/breakbar.rs b/evtc/src/agent/breakbar.rs
@@ -5,7 +5,7 @@ use num_enum::{FromPrimitive, IntoPrimitive};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// Breakbar state change.
 #[derive(Debug, Clone)]
@@ -82,7 +82,7 @@ impl TryExtract for BreakbarPercentEvent {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(u16)]
 pub enum BreakbarState {

diff --git a/evtc/src/buff/apply.rs b/evtc/src/buff/apply.rs
@@ -8,7 +8,7 @@ use crate::{
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// Buff apply event.
 #[derive(Debug, Clone)]
@@ -55,7 +55,7 @@ impl TryExtract for BuffApplyEvent {
 #[cfg_attr(feature = "serde", serde(tag = "kind"))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(u8)]
 pub enum BuffApplyKind {

diff --git a/evtc/src/buff/attribute.rs b/evtc/src/buff/attribute.rs
@@ -4,7 +4,7 @@ use num_enum::{IntoPrimitive, TryFromPrimitive};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// Attributes for buff formulas.
 ///
@@ -16,7 +16,7 @@ use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(u16)]
 pub enum Attribute {

diff --git a/evtc/src/buff/damage.rs b/evtc/src/buff/damage.rs
@@ -9,7 +9,7 @@ use num_enum::{FromPrimitive, IntoPrimitive};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// Buff damage event.
 ///
@@ -64,7 +64,7 @@ impl TryExtract for BuffDamageEvent {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(u8)]
 pub enum BuffDamageResult {
@@ -95,7 +95,7 @@ pub enum BuffDamageResult {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(u8)]
 pub enum BuffCycle {

diff --git a/evtc/src/buff/info.rs b/evtc/src/buff/info.rs
@@ -5,7 +5,7 @@ use num_enum::{IntoPrimitive, TryFromPrimitive};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// Buff information from an [`Event`] with [`StateChange::BuffInfo`].
 #[derive(Debug, Clone)]
@@ -152,7 +152,7 @@ pub enum BuffCategoryOld {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(u8)]
 pub enum BuffStackType {

diff --git a/evtc/src/buff/remove.rs b/evtc/src/buff/remove.rs
@@ -9,7 +9,7 @@ use num_enum::{FromPrimitive, IntoPrimitive};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// Buff remove event.
 #[derive(Debug, Clone)]
@@ -59,7 +59,7 @@ impl TryExtract for BuffRemoveEvent {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(u8)]
 pub enum BuffRemove {
@@ -96,7 +96,7 @@ pub enum BuffRemove {
 #[cfg_attr(feature = "serde", serde(tag = "kind"))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 pub enum BuffRemoveKind {
     /// Last or all stacks removed.

diff --git a/evtc/src/effect/guid.rs b/evtc/src/effect/guid.rs
@@ -8,7 +8,7 @@ use num_enum::{IntoPrimitive, TryFromPrimitive};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// Effect information from an [`Event`] with [`StateChange::IdToGUID`].
 #[derive(Debug, Clone)]
@@ -59,7 +59,7 @@ impl TryExtract for EffectGUID {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(u32)]
 pub enum ContentLocal {

diff --git a/evtc/src/event/category.rs b/evtc/src/event/category.rs
@@ -4,14 +4,14 @@ use crate::{Activation, BuffRemove, Event, StateChange};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// Possible [`Event`] categories.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 pub enum EventCategory {
     /// State change event.

diff --git a/evtc/src/game/language.rs b/evtc/src/game/language.rs
@@ -4,7 +4,7 @@ use num_enum::{IntoPrimitive, TryFromPrimitive};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// GW2 client language.
 #[derive(
@@ -13,7 +13,7 @@ use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(i32)]
 pub enum Language {

diff --git a/evtc/src/player/prof.rs b/evtc/src/player/prof.rs
@@ -4,7 +4,7 @@ use num_enum::{FromPrimitive, IntoPrimitive};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// Player profession.
 #[derive(
@@ -13,7 +13,7 @@ use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(u32)]
 pub enum Profession {

diff --git a/evtc/src/player/spec.rs b/evtc/src/player/spec.rs
@@ -5,7 +5,7 @@ use num_enum::{FromPrimitive, IntoPrimitive};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "strum")]
-use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
+use strum::{Display, EnumCount, EnumIter, IntoStaticStr, VariantNames};
 
 /// Player specialization.
 #[derive(
@@ -14,7 +14,7 @@ use strum::{Display, EnumCount, EnumIter, EnumVariantNames, IntoStaticStr};
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
     feature = "strum",
-    derive(Display, EnumCount, EnumIter, IntoStaticStr, EnumVariantNames)
+    derive(Display, EnumCount, EnumIter, IntoStaticStr, VariantNames)
 )]
 #[repr(u32)]
 pub enum Specialization {