mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
update further dependencies, including strum and get rid of old strum_macro
This commit is contained in:
Marcel Märtens
parent
73d6d96499
commit
64b9602760
130
Cargo.lock
generated
130
Cargo.lock
generated
@ -1286,15 +1286,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "crossterm"
|
||||
version = "0.22.1"
|
||||
version = "0.23.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c85525306c4291d1b73ce93c8acf9c339f9b213aef6c1d85c3830cbf1c16325c"
|
||||
checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"crossterm_winapi 0.9.0",
|
||||
"libc",
|
||||
"mio 0.7.14",
|
||||
"parking_lot 0.11.2",
|
||||
"mio 0.8.2",
|
||||
"parking_lot 0.12.0",
|
||||
"signal-hook 0.3.13",
|
||||
"signal-hook-mio",
|
||||
"winapi 0.3.9",
|
||||
@ -1670,20 +1670,21 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "enumset"
|
||||
version = "1.0.8"
|
||||
version = "1.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6216d2c19a6fb5f29d1ada1dc7bc4367a8cbf0fa4af5cf12e07b5bbdde6b5b2c"
|
||||
checksum = "42f0ae74db31a8ba0093a411d594a1d6d65c207611816ebf4e75381f3f72b1fe"
|
||||
dependencies = [
|
||||
"enumset_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "enumset_derive"
|
||||
version = "0.5.5"
|
||||
version = "0.5.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6451128aa6655d880755345d085494cf7561a6bee7c8dc821e5d77e6d267ecd4"
|
||||
checksum = "5c594871f94ab3a00434cb09f03067c92fa2ece4cc657d58ba402e8377cd85a3"
|
||||
dependencies = [
|
||||
"darling 0.13.2",
|
||||
"proc-macro-crate 1.1.3",
|
||||
"proc-macro2 1.0.36",
|
||||
"quote 1.0.17",
|
||||
"syn 1.0.90",
|
||||
@ -1766,9 +1767,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "euclid"
|
||||
version = "0.22.6"
|
||||
version = "0.22.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "da96828553a086d7b18dcebfc579bd9628b016f86590d7453c115e490fa74b80"
|
||||
checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade"
|
||||
dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
@ -1808,7 +1809,7 @@ checksum = "46e245f4c8ec30c6415c56cb132c07e69e74f1942f6b4a4061da748b49f486ca"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"rustix",
|
||||
"windows-sys",
|
||||
"windows-sys 0.30.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2325,9 +2326,9 @@ checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
|
||||
|
||||
[[package]]
|
||||
name = "git2"
|
||||
version = "0.13.25"
|
||||
version = "0.14.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f29229cc1b24c0e6062f6e742aa3e256492a5323365e5ed3413599f8a5eff7d6"
|
||||
checksum = "3826a6e0e2215d7a41c2bfc7c9244123969273f3476b939a226aac0ab56e9e3c"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"libc",
|
||||
@ -3036,9 +3037,9 @@ checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f"
|
||||
|
||||
[[package]]
|
||||
name = "libgit2-sys"
|
||||
version = "0.12.26+1.3.0"
|
||||
version = "0.13.2+1.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "19e1c899248e606fbfe68dcb31d8b0176ebab833b103824af31bddf4b7457494"
|
||||
checksum = "3a42de9a51a5c12e00fc0e4ca6bc2ea43582fc6418488e8f615e905d886f258b"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
@ -4147,6 +4148,16 @@ dependencies = [
|
||||
"parking_lot_core 0.8.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.12.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
|
||||
dependencies = [
|
||||
"lock_api 0.4.7",
|
||||
"parking_lot_core 0.9.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot_core"
|
||||
version = "0.7.2"
|
||||
@ -4175,6 +4186,19 @@ dependencies = [
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot_core"
|
||||
version = "0.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"libc",
|
||||
"redox_syscall 0.2.13",
|
||||
"smallvec",
|
||||
"windows-sys 0.34.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parse-zoneinfo"
|
||||
version = "0.3.0"
|
||||
@ -5541,7 +5565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"mio 0.7.14",
|
||||
"mio 0.8.2",
|
||||
"signal-hook 0.3.13",
|
||||
]
|
||||
|
||||
@ -5854,20 +5878,20 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "strum"
|
||||
version = "0.23.0"
|
||||
version = "0.24.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb"
|
||||
checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8"
|
||||
dependencies = [
|
||||
"strum_macros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "strum_macros"
|
||||
version = "0.23.1"
|
||||
version = "0.24.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38"
|
||||
checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef"
|
||||
dependencies = [
|
||||
"heck 0.3.3",
|
||||
"heck 0.4.0",
|
||||
"proc-macro2 1.0.36",
|
||||
"quote 1.0.17",
|
||||
"rustversion",
|
||||
@ -6229,10 +6253,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tracy-client"
|
||||
version = "0.12.6"
|
||||
version = "0.12.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62c0e37fbf87980abd5c35c3d86fd150c5ed349c3ae90959ba1877c799388203"
|
||||
checksum = "dffcb26a0c786a0e154afdf21284969ff23759f42f156bcfddddae1a3c2404f2"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"tracy-client-sys",
|
||||
]
|
||||
|
||||
@ -6501,7 +6526,6 @@ dependencies = [
|
||||
"spin_sleep",
|
||||
"structopt",
|
||||
"strum",
|
||||
"strum_macros",
|
||||
"tracing",
|
||||
"tracing-subscriber",
|
||||
"uuid",
|
||||
@ -6747,7 +6771,7 @@ version = "0.12.0"
|
||||
dependencies = [
|
||||
"ansi-parser",
|
||||
"clap 3.1.8",
|
||||
"crossterm 0.22.1",
|
||||
"crossterm 0.23.2",
|
||||
"lazy_static",
|
||||
"num_cpus",
|
||||
"ron 0.7.0",
|
||||
@ -6818,7 +6842,6 @@ dependencies = [
|
||||
"specs",
|
||||
"specs-idvs",
|
||||
"strum",
|
||||
"strum_macros",
|
||||
"tokio",
|
||||
"tracing",
|
||||
"treeculler",
|
||||
@ -6894,7 +6917,7 @@ dependencies = [
|
||||
name = "veloren-voxygen-i18n"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"clap 2.34.0",
|
||||
"clap 3.1.8",
|
||||
"deunicode",
|
||||
"git2",
|
||||
"hashbrown 0.11.2",
|
||||
@ -7649,11 +7672,24 @@ version = "0.30.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "030b7ff91626e57a05ca64a07c481973cbb2db774e4852c9c7ca342408c6a99a"
|
||||
dependencies = [
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_msvc",
|
||||
"windows_aarch64_msvc 0.30.0",
|
||||
"windows_i686_gnu 0.30.0",
|
||||
"windows_i686_msvc 0.30.0",
|
||||
"windows_x86_64_gnu 0.30.0",
|
||||
"windows_x86_64_msvc 0.30.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.34.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825"
|
||||
dependencies = [
|
||||
"windows_aarch64_msvc 0.34.0",
|
||||
"windows_i686_gnu 0.34.0",
|
||||
"windows_i686_msvc 0.34.0",
|
||||
"windows_x86_64_gnu 0.34.0",
|
||||
"windows_x86_64_msvc 0.34.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -7662,30 +7698,60 @@ version = "0.30.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.34.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.30.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.34.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.30.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.34.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.30.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.34.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.30.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.34.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
|
||||
|
||||
[[package]]
|
||||
name = "winit"
|
||||
version = "0.25.0"
|
||||
|
||||
@ -34,9 +34,7 @@ sha2 = "0.10"
|
||||
serde_json = "1.0.50"
|
||||
|
||||
# Strum
|
||||
strum = { version = "0.23", features = ["derive"] }
|
||||
# TODO: remove this and rewrite every use of strum_macros to strum
|
||||
strum_macros = "0.23"
|
||||
strum = { version = "0.24", features = ["derive"] }
|
||||
|
||||
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
|
||||
approx = "0.4.0"
|
||||
|
||||
@ -40,7 +40,7 @@ impl ChatCommandData {
|
||||
}
|
||||
|
||||
// Please keep this sorted alphabetically :-)
|
||||
#[derive(Copy, Clone, strum_macros::EnumIter)]
|
||||
#[derive(Copy, Clone, strum::EnumIter)]
|
||||
pub enum ChatCommand {
|
||||
Adminify,
|
||||
Airship,
|
||||
|
||||
@ -12,8 +12,7 @@ use serde::{Deserialize, Serialize};
|
||||
use specs::{Component, DerefFlaggedStorage, Entity as EcsEntity};
|
||||
use specs_idvs::IdvStorage;
|
||||
use std::{collections::VecDeque, fmt};
|
||||
use strum::IntoEnumIterator;
|
||||
use strum_macros::EnumIter;
|
||||
use strum::{EnumIter, IntoEnumIterator};
|
||||
use vek::*;
|
||||
|
||||
use super::dialogue::Subject;
|
||||
|
||||
@ -25,7 +25,7 @@ use crate::{
|
||||
use serde::{Deserialize, Serialize};
|
||||
use specs::{Component, DerefFlaggedStorage};
|
||||
use specs_idvs::IdvStorage;
|
||||
use strum_macros::Display;
|
||||
use strum::Display;
|
||||
use vek::*;
|
||||
|
||||
use super::{BuffKind, Density, Mass};
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
use crate::{make_case_elim, make_proj_elim};
|
||||
use rand::{seq::SliceRandom, thread_rng};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use strum_macros::{Display, EnumString};
|
||||
use strum::{Display, EnumString};
|
||||
|
||||
make_proj_elim!(
|
||||
body,
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
use crate::{make_case_elim, make_proj_elim};
|
||||
use rand::{seq::SliceRandom, thread_rng};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use strum_macros::{Display, EnumString};
|
||||
use strum::{Display, EnumString};
|
||||
|
||||
make_proj_elim!(
|
||||
body,
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
use crate::{make_case_elim, make_proj_elim};
|
||||
use rand::{seq::SliceRandom, thread_rng};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use strum_macros::{Display, EnumString};
|
||||
use strum::{Display, EnumString};
|
||||
|
||||
make_proj_elim!(
|
||||
body,
|
||||
|
||||
@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
|
||||
use specs::{Component, DerefFlaggedStorage};
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
use specs_idvs::IdvStorage;
|
||||
use strum_macros::EnumIter;
|
||||
use strum::EnumIter;
|
||||
|
||||
/// De/buff Kind.
|
||||
/// This is used to determine what effects a buff will have
|
||||
|
||||
@ -14,7 +14,7 @@ use serde::{Deserialize, Serialize};
|
||||
use specs::{Component, DerefFlaggedStorage};
|
||||
use specs_idvs::IdvStorage;
|
||||
use std::collections::BTreeMap;
|
||||
use strum_macros::Display;
|
||||
use strum::Display;
|
||||
|
||||
/// Data returned from character behavior fn's to Character Behavior System.
|
||||
pub struct StateUpdate {
|
||||
|
||||
@ -25,7 +25,7 @@ use serde::{de, Deserialize, Serialize, Serializer};
|
||||
use specs::{Component, DerefFlaggedStorage};
|
||||
use specs_idvs::IdvStorage;
|
||||
use std::{collections::hash_map::DefaultHasher, fmt, sync::Arc};
|
||||
use strum_macros::IntoStaticStr;
|
||||
use strum::IntoStaticStr;
|
||||
use tracing::error;
|
||||
use vek::Rgb;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ use crate::{
|
||||
use hashbrown::HashMap;
|
||||
use rand::{self, distributions::WeightedError, seq::SliceRandom, Rng};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use strum_macros::EnumIter;
|
||||
use strum::EnumIter;
|
||||
use tracing::warn;
|
||||
|
||||
/// Builder for character Loadouts, containing weapon and armour items belonging
|
||||
|
||||
@ -25,7 +25,7 @@ use std::{
|
||||
ops::{Add, Div},
|
||||
time::Duration,
|
||||
};
|
||||
use strum_macros::Display;
|
||||
use strum::Display;
|
||||
use vek::*;
|
||||
|
||||
pub const MOVEMENT_THRESHOLD_VEL: f32 = 3.0;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
use serde::{Deserialize, Serialize};
|
||||
use strum_macros::EnumIter;
|
||||
use strum::EnumIter;
|
||||
|
||||
#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Hash, EnumIter)]
|
||||
pub enum BiomeKind {
|
||||
|
||||
@ -8,7 +8,7 @@ use num_derive::FromPrimitive;
|
||||
use num_traits::FromPrimitive;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::ops::Deref;
|
||||
use strum_macros::{Display, EnumIter, EnumString};
|
||||
use strum::{Display, EnumIter, EnumString};
|
||||
use vek::*;
|
||||
|
||||
make_case_elim!(
|
||||
|
||||
@ -7,7 +7,7 @@ use crate::{
|
||||
};
|
||||
use hashbrown::HashMap;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use strum_macros::EnumIter;
|
||||
use strum::EnumIter;
|
||||
use tracing::{trace, warn};
|
||||
|
||||
#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
|
||||
|
||||
@ -35,7 +35,7 @@ tokio = { version = "1.14", default-features = false, features = ["rt-multi-thre
|
||||
num_cpus = "1.0"
|
||||
ansi-parser = "0.8"
|
||||
clap = { version = "3.1.8", features = ["derive"] }
|
||||
crossterm = "0.22"
|
||||
crossterm = "0.23"
|
||||
lazy_static = "1"
|
||||
signal-hook = "0.3.6"
|
||||
shell-words = "1.0.0"
|
||||
|
||||
@ -28,7 +28,7 @@ network = { package = "veloren-network", path = "../network", features = ["metri
|
||||
specs = { git = "https://github.com/amethyst/specs.git", features = ["shred-derive"], rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46" }
|
||||
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "8be2abcddf8f524cb5876e8dd20a7e47cfaf7573" }
|
||||
|
||||
strum = { version = "0.23", features = ["derive"] }
|
||||
strum = { version = "0.24", features = ["derive"] }
|
||||
bincode = "1.3.2"
|
||||
num_cpus = "1.0"
|
||||
tracing = "0.1"
|
||||
|
||||
@ -117,8 +117,7 @@ rodio = {version = "0.15", default-features = false, features = ["vorbis"]}
|
||||
ron = {version = "0.7", default-features = false}
|
||||
serde = {version = "1.0", features = [ "rc", "derive" ]}
|
||||
slab = "0.4.2"
|
||||
strum = { version = "0.23", features = ["derive"] }
|
||||
strum_macros = "0.23"
|
||||
strum = { version = "0.24", features = ["derive"] }
|
||||
treeculler = "0.2"
|
||||
tokio = { version = "1.14", default-features = false, features = ["rt-multi-thread"] }
|
||||
num_cpus = "1.0"
|
||||
|
||||
@ -18,13 +18,13 @@ serde = { version = "1.0", features = ["derive"] }
|
||||
tracing = "0.1"
|
||||
# Diagnostic
|
||||
ron = "0.7"
|
||||
git2 = { version = "0.13", default-features = false, optional = true }
|
||||
git2 = { version = "0.14", default-features = false, optional = true }
|
||||
|
||||
# Binary
|
||||
clap = { version = "2.33", features = ["suggestions"], default-features = false, optional = true }
|
||||
clap = { version = "3.1.8", features = ["suggestions", "std"], default-features = false, optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
git2 = { version = "0.13", default-features = false }
|
||||
git2 = { version = "0.14", default-features = false }
|
||||
|
||||
[features]
|
||||
bin = ["git2", "clap"]
|
||||
|
||||
@ -1,34 +1,30 @@
|
||||
use clap::{App, Arg};
|
||||
use clap::{Arg, Command};
|
||||
use veloren_voxygen_i18n::{analysis, verification, BasePath};
|
||||
|
||||
fn main() {
|
||||
let matches = App::new("i18n-check")
|
||||
let matches = Command::new("i18n-check")
|
||||
.version("0.1.0")
|
||||
.author("juliancoffee <lightdarkdaughter@gmail.com>")
|
||||
.about("Test veloren localizations")
|
||||
.arg(
|
||||
Arg::with_name("CODE")
|
||||
Arg::new("CODE")
|
||||
.required(false)
|
||||
.help("Run diagnostic for specific language code (de_DE as example)"),
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("verify")
|
||||
Arg::new("verify")
|
||||
.long("verify")
|
||||
.help("verify all localizations"),
|
||||
)
|
||||
.arg(Arg::new("test").long("test").help("test all localizations"))
|
||||
.arg(
|
||||
Arg::with_name("test")
|
||||
.long("test")
|
||||
.help("test all localizations"),
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("verbose")
|
||||
.short("v")
|
||||
Arg::new("verbose")
|
||||
.short('v')
|
||||
.long("verbose")
|
||||
.help("print additional information"),
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("csv")
|
||||
Arg::new("csv")
|
||||
.long("csv")
|
||||
.help("generate csv files per language in target folder"),
|
||||
)
|
||||
|
||||
@ -30,8 +30,7 @@ use conrod_core::{
|
||||
use i18n::Localization;
|
||||
use std::sync::Arc;
|
||||
|
||||
use strum::IntoEnumIterator;
|
||||
use strum_macros::EnumIter;
|
||||
use strum::{EnumIter, IntoEnumIterator};
|
||||
|
||||
widget_ids! {
|
||||
pub struct Ids {
|
||||
|
||||
@ -19,8 +19,7 @@ use conrod_core::{
|
||||
};
|
||||
use i18n::Localization;
|
||||
|
||||
use strum::IntoEnumIterator;
|
||||
use strum_macros::EnumIter;
|
||||
use strum::{EnumIter, IntoEnumIterator};
|
||||
|
||||
widget_ids! {
|
||||
struct Ids {
|
||||
|
||||
@ -57,7 +57,7 @@ minifb = "0.22"
|
||||
rusqlite = { version = "0.24.2", features = ["array", "vtab", "bundled", "trace"] }
|
||||
svg_fmt = "0.4"
|
||||
structopt = "0.3"
|
||||
strum = "0.23"
|
||||
strum = "0.24"
|
||||
|
||||
[[bench]]
|
||||
harness = false
|
||||
|
||||
Loading…
Reference in New Issue
Block a user