Merge branch 'xMAC94x/update-deps2' into 'master'

update_deps_2 - now with more expirmental stuff

See merge request veloren/veloren!3634

client/Cargo.toml

@@ -38,10 +38,10 @@ authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253
 async-channel = { version = "1.6", optional = true }
 common-ecs = { package = "veloren-common-ecs", path = "../common/ecs", optional = true }
 serde = { version = "1.0", features = [ "rc", "derive" ], optional = true }
-ron = { version = "0.7", default-features = false, optional = true }
+ron = { version = "0.8", default-features = false, optional = true }
 clap = { version = "3.1.8", optional = true, features = ["color", "std"] }
 structopt = { version = "0.3.13", optional = true }
-rustyline = { version = "9.0.0", optional = true }
+rustyline = { version = "10.0.0", optional = true }
 ## logging
 termcolor = { version = "1.1", optional = true }
 common-frontend = { package = "veloren-common-frontend", path = "../common/frontend", optional = true }

client/src/bin/bot/tui.rs

@@ -26,7 +26,7 @@ impl Tui {
 
         let handle = thread::spawn(move || {
             thread::sleep(Duration::from_millis(20));
-            let mut readline = rustyline::Editor::<()>::new();
+            let mut readline = rustyline::Editor::<()>::new().unwrap();
             while let Ok(cmd) = readline.readline("\n\nbotclient> ") {
                 let keep_going = Self::process_command(&cmd, &mut commands_s);
                 readline.add_history_entry(cmd);

common/Cargo.toml

@@ -26,9 +26,9 @@ common-base = { package = "veloren-common-base", path = "base" }
 serde = { version = "1.0.110", features = ["derive", "rc"] }
 
 # Util
-enum-iterator = "0.7"
+enum-iterator = "1.1.0"
 vek = { version = "0.15.8", features = ["serde"] }
-chrono = "0.4"
+chrono = "0.4.22"
 chrono-tz = "0.6"
 sha2 = "0.10"
 serde_json = "1.0.50"

common/assets/Cargo.toml

@@ -8,7 +8,7 @@ version = "0.10.0"
 [dependencies]
 lazy_static = "1.4.0"
 assets_manager = {version = "0.8.1", features = ["bincode", "ron", "json"]}
-ron = { version = "0.7", default-features = false }
+ron = { version = "0.8", default-features = false }
 dot_vox = "4.0"
 wavefront = "0.2" # TODO: Use vertex-colors branch when we have models that have them
 image = { version = "0.24", default-features = false, features = ["png"] }

common/dynlib/Cargo.toml

@@ -7,5 +7,5 @@ edition = "2021"
 [dependencies]
 find_folder = {version = "0.3.0"}
 libloading = {version = "0.7"}
-notify = {version = "5.0.0-pre.13"}
+notify = {version = "5.0.0"}
 tracing = "0.1"

common/src/terrain/sprite.rs

@@ -1,5 +1,5 @@
 use crate::{comp::tool::ToolKind, lottery::LootSpec, make_case_elim};
-use enum_iterator::IntoEnumIterator;
+use enum_iterator::Sequence;
 use hashbrown::HashMap;
 use lazy_static::lazy_static;
 use num_derive::FromPrimitive;
@@ -17,7 +17,7 @@ make_case_elim!(
         PartialEq,
         Serialize,
         Deserialize,
-        IntoEnumIterator,
+        Sequence,
         FromPrimitive,
     )]
     #[repr(u8)]
@@ -558,7 +558,7 @@ impl fmt::Display for SpriteKind {
 }
 
 lazy_static! {
-    pub static ref SPRITE_KINDS: HashMap<String, SpriteKind> = SpriteKind::into_enum_iter()
+    pub static ref SPRITE_KINDS: HashMap<String, SpriteKind> = enum_iterator::all::<SpriteKind>()
         .map(|sk| (sk.to_string(), sk))
         .collect();
 }

server-cli/Cargo.toml

@@ -35,12 +35,12 @@ 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.23"
+crossterm = "0.25"
 lazy_static = "1"
 signal-hook = "0.3.6"
 shell-words = "1.0.0"
 tracing = { version = "0.1", default-features = false }
-ron = {version = "0.7", default-features = false}
+ron = {version = "0.8", default-features = false}
 serde = {version = "1.0", features = [ "rc", "derive" ]}
 
 [target.'cfg(windows)'.dependencies]

server/Cargo.toml

@@ -42,13 +42,13 @@ quinn = "0.8"
 rustls = { version = "0.20", default-features = false }
 rustls-pemfile = { version = "1", default-features = false }
 atomicwrites = "0.3.0"
-chrono = { version = "0.4.19", features = ["serde"] }
+chrono = { version = "0.4.22", features = ["serde"] }
 chrono-tz = { version = "0.6", features = ["serde"] }
 drop_guard = { version = "0.3.0" }
 humantime = "2.1.0"
 itertools = "0.10"
 lazy_static = "1.4.0"
-ron = { version = "0.7", default-features = false }
+ron = { version = "0.8", default-features = false }
 serde = { version = "1.0.110", features = ["derive"] }
 serde_json = "1.0.50"
 rand = { version = "0.8", features = ["small_rng"] }

voxygen/Cargo.toml

@@ -86,7 +86,7 @@ specs = { version = "0.18", features = ["serde", "storage-event-control", "deriv
 vek = {version = "0.15.8", features = ["serde"]}
 
 # Controller
-gilrs = {version = "0.8.0", features = ["serde-serialize"]}
+gilrs = {version = "0.9.0", features = ["serde-serialize"]}
 
 # Singleplayer
 server = { package = "veloren-server", path = "../server", optional = true, default-features = false, features = ["worldgen"] }
@@ -98,16 +98,16 @@ clap = { version = "3.2.20", features = ["derive"] }
 assets_manager = {version = "0.8", features = ["ab_glyph"]}
 backtrace = "0.3.40"
 bincode = "1.3.1"
-chrono = { version = "0.4.19", features = ["serde"] }
+chrono = { version = "0.4.22", features = ["serde"] }
 chumsky = "0.8"
-cpal = "0.13"
+cpal = "0.14"
 copy_dir = "0.1.2"
 crossbeam-utils = "0.8.1"
 crossbeam-channel = "0.5"
 # TODO: remove
 directories-next = "2.0"
 dot_vox = "4.0"
-enum-iterator = "0.7"
+enum-iterator = "1.1.0"
 guillotiere = "0.6.2"
 etagere = "0.2.7"
 hashbrown = {version = "0.12", features = ["rayon", "serde", "nightly"]}
@@ -120,7 +120,7 @@ rand = "0.8"
 rand_chacha = "0.3"
 rayon = "1.5"
 rodio = {version = "0.15", default-features = false, features = ["vorbis"]}
-ron = {version = "0.7", default-features = false}
+ron = {version = "0.8", default-features = false}
 serde = {version = "1.0", features = [ "rc", "derive" ]}
 slab = "0.4.2"
 strum = { version = "0.24", features = ["derive"] }

voxygen/i18n/Cargo.toml

@@ -8,7 +8,7 @@ version = "0.13.0"
 [dependencies]
 # Assets
 common-assets = {package = "veloren-common-assets", path = "../../common/assets"}
-ron = "0.7"
+ron = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 # Localization
 unic-langid = { version = "0.9"}

voxygen/src/scene/terrain.rs

@@ -31,7 +31,6 @@ use common::{
 use common_base::{prof_span, span};
 use core::{f32, fmt::Debug, marker::PhantomData, time::Duration};
 use crossbeam_channel as channel;
-use enum_iterator::IntoEnumIterator;
 use guillotiere::AtlasAllocator;
 use hashbrown::HashMap;
 use serde::Deserialize;
@@ -196,7 +195,7 @@ impl TryFrom<HashMap<SpriteKind, Option<SpriteConfig<String>>>> for SpriteSpec {
         mut map: HashMap<SpriteKind, Option<SpriteConfig<String>>>,
     ) -> Result<Self, Self::Error> {
         let mut array = [(); 256].map(|()| None);
-        let sprites_missing = SpriteKind::into_enum_iter()
+        let sprites_missing = enum_iterator::all::<SpriteKind>()
             .filter(|kind| match map.remove(kind) {
                 Some(config) => {
                     array[*kind as usize] = config;
@@ -454,7 +453,7 @@ impl SpriteRenderContext {
             );
             let mut sprite_mesh = Mesh::new();
             // NOTE: Tracks the start vertex of the next model to be meshed.
-            let sprite_data: HashMap<(SpriteKind, usize), _> = SpriteKind::into_enum_iter()
+            let sprite_data: HashMap<(SpriteKind, usize), _> = enum_iterator::all::<SpriteKind>()
                 .filter_map(|kind| Some((kind, sprite_config.get(kind)?)))
                 .flat_map(|(kind, sprite_config)| {
                     sprite_config.variations.iter().enumerate().map(

world/Cargo.toml

@@ -16,8 +16,8 @@ common_base = { package = "veloren-common-base", path = "../common/base"}
 common-net = { package = "veloren-common-net", path = "../common/net" }
 
 bincode = "1.3.1"
-bitvec = "0.22"
+bitvec = "1.0.1"
-enum-iterator = "0.7"
+enum-iterator = "1.1.3"
 fxhash = "0.2.1"
 image = { version = "0.24", default-features = false, features = ["png"] }
 itertools = "0.10"
@@ -34,7 +34,7 @@ arr_macro = "0.1.2"
 packed_simd = { package = "packed_simd_2", version = "0.3.8", optional = true }
 rayon = "1.5"
 serde = { version = "1.0.110", features = ["derive"] }
-ron = { version = "0.7", default-features = false }
+ron = { version = "0.8", default-features = false }
 # inline_tweak = "1.0.2"
 kiddo = "0.2"
 
@@ -53,7 +53,7 @@ common-frontend = { package = "veloren-common-frontend", path = "../common/front
 criterion = "0.3"
 csv = "1.1.3"
 tracing-subscriber = { version = "0.3.7", default-features = false, features = ["fmt", "time", "ansi", "smallvec", "env-filter"] }
-minifb = "0.22"
+minifb = "0.23"
 rusqlite = { version = "0.24.2", features = ["array", "vtab", "bundled", "trace"] }
 svg_fmt = "0.4"
 structopt = "0.3"

world/src/all.rs

@@ -1,9 +1,9 @@
 use crate::util::math::close;
-use enum_iterator::IntoEnumIterator;
+use enum_iterator::Sequence;
 use std::ops::Range;
 use vek::Vec2;
 
-#[derive(Copy, Clone, Debug, IntoEnumIterator)]
+#[derive(Copy, Clone, Debug, Sequence)]
 pub enum ForestKind {
     Palm,
     Acacia,

world/src/sim/mod.rs

@@ -52,7 +52,6 @@ use common::{
     vol::RectVolSize,
 };
 use common_net::msg::WorldMapMsg;
-use enum_iterator::IntoEnumIterator;
 use noise::{
     BasicMulti, Billow, Fbm, HybridMulti, MultiFractal, NoiseFn, RangeFunction, RidgedMulti,
     Seedable, SuperSimplex, Worley,
@@ -2239,7 +2238,7 @@ impl WorldSim {
         };
         let env = chunk.get_environment();
         Lottery::from(
-            ForestKind::into_enum_iter()
+            enum_iterator::all::<ForestKind>()
                 .enumerate()
                 .map(|(i, fk)| {
                     const CLUSTER_SIZE: f64 = 48.0;
@@ -2552,7 +2551,7 @@ impl SimChunk {
                     },
                 };
 
-                ForestKind::into_enum_iter()
+                enum_iterator::all::<ForestKind>()
                     .max_by_key(|fk| (fk.proclivity(&env) * 10000.0) as u32)
                     .unwrap() // Can't fail
             },