Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update strum and itertools

Browse Source
This commit is contained in:
Youser Nayme 2024-06-23 11:54:16 -04:00
parent 36d192a2f6
commit ca6bcaab7d
No known key found for this signature in database
GPG Key ID: 08E3619383679CAE
3 changed files with 32 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Cargo.lock generated
View File

@ -3386,6 +3386,15 @@ dependencies = [
"either", "either",
] ]
[[package]]
name = "itertools"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
dependencies = [
"either",
]
[[package]] [[package]]
name = "itoa" name = "itoa"
version = "1.0.11" version = "1.0.11"
@ -5194,7 +5203,7 @@ dependencies = [
"lru", "lru",
"paste", "paste",
"stability", "stability",
"strum 0.26.2", "strum",
"unicode-segmentation", "unicode-segmentation",
"unicode-width", "unicode-width",
] ]
@ -6292,42 +6301,20 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]] [[package]]
name = "strum" name = "strum"
version = "0.24.1" version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
dependencies = [ dependencies = [
"strum_macros 0.24.3", "strum_macros",
]
[[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",
] ]
[[package]] [[package]]
name = "strum_macros" name = "strum_macros"
version = "0.24.3" version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
dependencies = [ dependencies = [
"heck 0.4.1", "heck 0.5.0",
"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",
"proc-macro2 1.0.83", "proc-macro2 1.0.83",
"quote 1.0.36", "quote 1.0.36",
"rustversion", "rustversion",
@ -7123,7 +7110,7 @@ dependencies = [
"fxhash", "fxhash",
"hashbrown 0.14.5", "hashbrown 0.14.5",
"indexmap", "indexmap",
"itertools 0.10.5", "itertools 0.13.0",
"kiddo", "kiddo",
"lazy_static", "lazy_static",
"num-derive", "num-derive",
@ -7143,7 +7130,7 @@ dependencies = [
"slotmap", "slotmap",
"specs", "specs",
"spin_sleep", "spin_sleep",
"strum 0.24.1", "strum",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"uuid", "uuid",
@ -7270,7 +7257,7 @@ dependencies = [
name = "veloren-common-systems" name = "veloren-common-systems"
version = "0.10.0" version = "0.10.0"
dependencies = [ dependencies = [
"itertools 0.10.5", "itertools 0.13.0",
"ordered-float 3.9.2", "ordered-float 3.9.2",
"rand 0.8.5", "rand 0.8.5",
"rayon", "rayon",
@ -7352,7 +7339,7 @@ dependencies = [
"enum-map", "enum-map",
"fxhash", "fxhash",
"hashbrown 0.14.5", "hashbrown 0.14.5",
"itertools 0.10.5", "itertools 0.13.0",
"rand 0.8.5", "rand 0.8.5",
"rand_chacha 0.3.1", "rand_chacha 0.3.1",
"rayon", "rayon",
@ -7381,7 +7368,7 @@ dependencies = [
"futures-util", "futures-util",
"hashbrown 0.14.5", "hashbrown 0.14.5",
"humantime", "humantime",
"itertools 0.10.5", "itertools 0.13.0",
"lazy_static", "lazy_static",
"noise", "noise",
"num_cpus", "num_cpus",
@ -7400,7 +7387,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"specs", "specs",
"strum 0.24.1", "strum",
"tokio", "tokio",
"tracing", "tracing",
"vek 0.17.0", "vek 0.17.0",
@ -7421,7 +7408,7 @@ dependencies = [
name = "veloren-server-agent" name = "veloren-server-agent"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"itertools 0.10.5", "itertools 0.13.0",
"lazy_static", "lazy_static",
"rand 0.8.5", "rand 0.8.5",
"specs", "specs",
@ -7500,7 +7487,7 @@ dependencies = [
"iced_winit", "iced_winit",
"image", "image",
"inline_tweak", "inline_tweak",
"itertools 0.10.5", "itertools 0.13.0",
"keyboard-keynames", "keyboard-keynames",
"lazy_static", "lazy_static",
"levenshtein", "levenshtein",
@ -7520,7 +7507,7 @@ dependencies = [
"shaderc", "shaderc",
"slab", "slab",
"specs", "specs",
"strum 0.24.1", "strum",
"tokio", "tokio",
"tracing", "tracing",
"treeculler", "treeculler",
@ -7600,7 +7587,7 @@ dependencies = [
"hashbrown 0.14.5", "hashbrown 0.14.5",
"image", "image",
"indicatif", "indicatif",
"itertools 0.10.5", "itertools 0.13.0",
"kiddo", "kiddo",
"lazy_static", "lazy_static",
"lz-fear", "lz-fear",
@ -7617,7 +7604,7 @@ dependencies = [
"rusqlite", "rusqlite",
"serde", "serde",
"signal-hook", "signal-hook",
"strum 0.24.1", "strum",
"svg_fmt", "svg_fmt",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",

4
Cargo.toml
View File

@ -140,7 +140,7 @@ futures-util = { version = "0.3.7", default-features = false }
prometheus = { version = "0.13", default-features = false } prometheus = { version = "0.13", default-features = false }
prometheus-hyper = "0.2" prometheus-hyper = "0.2"
strum = { version = "0.24", features = ["derive"] } strum = { version = "0.26.3", features = ["derive"] }
enum-map = { version = "2.4" } enum-map = { version = "2.4" }
hashbrown = { version = "0.14", features = ["rayon", "serde", "nightly"] } hashbrown = { version = "0.14", features = ["rayon", "serde", "nightly"] }
fxhash = { version = "0.2.1" } fxhash = { version = "0.2.1" }
@ -150,7 +150,7 @@ ordered-float = { version = "3", default-features = true }
num = { version = "0.4" } num = { version = "0.4" }
num-traits = { version = "0.2" } num-traits = { version = "0.2" }
vek = { version = "0.17.0", features = ["serde"] } vek = { version = "0.17.0", features = ["serde"] }
itertools = { version = "0.10" } itertools = { version = "0.13" }
serde = { version = "1.0.118", features = ["derive"] } serde = { version = "1.0.118", features = ["derive"] }
serde_json = { version = "1.0.50" } serde_json = { version = "1.0.50" }

6
common/src/comp/admin.rs
View File

@ -1,11 +1,11 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use specs::{Component, DerefFlaggedStorage, VecStorage}; 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 // of the clap dependency
#[derive( #[derive(
Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd, Serialize, Deserialize, EnumVariantNames, Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd, Serialize, Deserialize, VariantNames,
)] )]
pub enum AdminRole { pub enum AdminRole {
Moderator = 0, Moderator = 0,