diff --git a/Cargo.lock b/Cargo.lock index c089c30036..a593d7064a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3386,6 +3386,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -5194,7 +5203,7 @@ dependencies = [ "lru", "paste", "stability", - "strum 0.26.2", + "strum", "unicode-segmentation", "unicode-width", ] @@ -6292,42 +6301,20 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.24.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ - "strum_macros 0.24.3", -] - -[[package]] -name = "strum" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" -dependencies = [ - "strum_macros 0.26.2", + "strum_macros", ] [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", - "proc-macro2 1.0.83", - "quote 1.0.36", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "strum_macros" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" -dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2 1.0.83", "quote 1.0.36", "rustversion", @@ -7123,7 +7110,7 @@ dependencies = [ "fxhash", "hashbrown 0.14.5", "indexmap", - "itertools 0.10.5", + "itertools 0.13.0", "kiddo", "lazy_static", "num-derive", @@ -7143,7 +7130,7 @@ dependencies = [ "slotmap", "specs", "spin_sleep", - "strum 0.24.1", + "strum", "tracing", "tracing-subscriber", "uuid", @@ -7270,7 +7257,7 @@ dependencies = [ name = "veloren-common-systems" version = "0.10.0" dependencies = [ - "itertools 0.10.5", + "itertools 0.13.0", "ordered-float 3.9.2", "rand 0.8.5", "rayon", @@ -7352,7 +7339,7 @@ dependencies = [ "enum-map", "fxhash", "hashbrown 0.14.5", - "itertools 0.10.5", + "itertools 0.13.0", "rand 0.8.5", "rand_chacha 0.3.1", "rayon", @@ -7381,7 +7368,7 @@ dependencies = [ "futures-util", "hashbrown 0.14.5", "humantime", - "itertools 0.10.5", + "itertools 0.13.0", "lazy_static", "noise", "num_cpus", @@ -7400,7 +7387,7 @@ dependencies = [ "serde", "serde_json", "specs", - "strum 0.24.1", + "strum", "tokio", "tracing", "vek 0.17.0", @@ -7421,7 +7408,7 @@ dependencies = [ name = "veloren-server-agent" version = "0.1.0" dependencies = [ - "itertools 0.10.5", + "itertools 0.13.0", "lazy_static", "rand 0.8.5", "specs", @@ -7500,7 +7487,7 @@ dependencies = [ "iced_winit", "image", "inline_tweak", - "itertools 0.10.5", + "itertools 0.13.0", "keyboard-keynames", "lazy_static", "levenshtein", @@ -7520,7 +7507,7 @@ dependencies = [ "shaderc", "slab", "specs", - "strum 0.24.1", + "strum", "tokio", "tracing", "treeculler", @@ -7600,7 +7587,7 @@ dependencies = [ "hashbrown 0.14.5", "image", "indicatif", - "itertools 0.10.5", + "itertools 0.13.0", "kiddo", "lazy_static", "lz-fear", @@ -7617,7 +7604,7 @@ dependencies = [ "rusqlite", "serde", "signal-hook", - "strum 0.24.1", + "strum", "svg_fmt", "tracing", "tracing-subscriber", diff --git a/Cargo.toml b/Cargo.toml index 3b5f3c93e6..4149a47a1b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -140,7 +140,7 @@ futures-util = { version = "0.3.7", default-features = false } prometheus = { version = "0.13", default-features = false } prometheus-hyper = "0.2" -strum = { version = "0.24", features = ["derive"] } +strum = { version = "0.26.3", features = ["derive"] } enum-map = { version = "2.4" } hashbrown = { version = "0.14", features = ["rayon", "serde", "nightly"] } fxhash = { version = "0.2.1" } @@ -150,7 +150,7 @@ ordered-float = { version = "3", default-features = true } num = { version = "0.4" } num-traits = { version = "0.2" } vek = { version = "0.17.0", features = ["serde"] } -itertools = { version = "0.10" } +itertools = { version = "0.13" } serde = { version = "1.0.118", features = ["derive"] } serde_json = { version = "1.0.50" } diff --git a/common/src/comp/admin.rs b/common/src/comp/admin.rs index 5109098320..ed4bbd0a3d 100644 --- a/common/src/comp/admin.rs +++ b/common/src/comp/admin.rs @@ -1,11 +1,11 @@ use serde::{Deserialize, Serialize}; use specs::{Component, DerefFlaggedStorage, VecStorage}; -use strum::EnumVariantNames; +use strum::VariantNames; -// EnumVariantNames is used by bins for clap only, but using strum here gets rid +// VariantNames is used by bins for clap only, but using strum here gets rid // of the clap dependency #[derive( - Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd, Serialize, Deserialize, EnumVariantNames, + Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd, Serialize, Deserialize, VariantNames, )] pub enum AdminRole { Moderator = 0,