Merge branch 'update-dependencies' into 'master'

Update most dependencies

See merge request veloren/veloren!372

chat-cli/Cargo.toml

@@ -8,5 +8,5 @@ edition = "2018"
 client = { package = "veloren-client", path = "../client" }
 common = { package = "veloren-common", path = "../common" }
 
-log = "0.4"
+log = "0.4.7"
-pretty_env_logger = "0.3"
+pretty_env_logger = "0.3.0"

client/Cargo.toml

@@ -7,8 +7,8 @@ edition = "2018"
 [dependencies]
 common = { package = "veloren-common", path = "../common" }
 
-log = "0.4"
-specs = "0.14"
-vek = "0.9"
 uvth = "3.1.0"
 num_cpus = "1.10.1"
+log = "0.4.7"
+specs = "0.14.2"
+vek = "0.9.8"

common/Cargo.toml

@@ -7,20 +7,20 @@ edition = "2018"
 [dependencies]
 sphynx = { git = "https://gitlab.com/veloren/sphynx.git", features = ["serde1"] }
 
-specs = { version = "0.14", features = ["serde", "nightly"] }
+specs = { version = "0.14.2", features = ["serde", "nightly"] }
-vek = { version = "0.9", features = ["serde"] }
+vek = { version = "0.9.8", features = ["serde"] }
-dot_vox = "4.0"
+dot_vox = "4.0.0"
-image = "0.21"
+image = "0.22.0"
-mio = "0.6"
+mio = "0.6.19"
-mio-extras = "2.0"
+mio-extras = "2.0.5"
-serde = "1.0"
+serde = "1.0.97"
-serde_derive = "1.0"
+serde_derive = "1.0.97"
-serde_json = "1.0.39"
+serde_json = "1.0.40"
-bincode = "1.1"
+bincode = "1.1.4"
-log = "0.4"
+log = "0.4.7"
-rand = "0.6.5"
+rand = "0.7.0"
-rayon = "1.0"
+rayon = "1.1.0"
-lazy_static = "1.3"
+lazy_static = "1.3.0"
-lz4-compress = "0.1"
+lz4-compress = "0.1.1"
-fxhash = "0.2"
+fxhash = "0.2.1"
-find_folder = "0.3"
+find_folder = "0.3.0"

server-cli/Cargo.toml

@@ -8,6 +8,6 @@ edition = "2018"
 server = { package = "veloren-server", path = "../server" }
 common = { package = "veloren-common", path = "../common" }
 
-log = "0.4"
 heaptrack = "0.3.0"
-pretty_env_logger = "0.3"
+log = "0.4.7"
+pretty_env_logger = "0.3.0"

server/Cargo.toml

@@ -8,9 +8,9 @@ edition = "2018"
 common = { package = "veloren-common", path = "../common" }
 world = { package = "veloren-world", path = "../world" }
 
-log = "0.4"
+log = "0.4.7"
-specs = "0.14"
+specs = "0.14.2"
-vek = "0.9"
+vek = "0.9.8"
 uvth = "3.1.0"
 lazy_static = "1.3.0"
 scan_fmt = "0.1.3"

voxygen/Cargo.toml

@@ -17,45 +17,45 @@ client = { package = "veloren-client", path = "../client" }
 server = { package = "veloren-server", path = "../server" }
 
 # Graphics
-gfx = "0.17"
+gfx = "0.18.1"
-gfx_device_gl = { version = "0.15", optional = true }
+gfx_device_gl = { version = "0.16.1", optional = true }
-gfx_window_glutin = "0.28"
+gfx_window_glutin = "0.31.0"
-glutin = "0.19"
+glutin = "0.21.0"
-winit = {version = "0.18", features = ["serde"]}
+winit = { version = "0.19.1", features = ["serde"] }
 conrod_core = { git = "https://gitlab.com/veloren/conrod.git" }
 conrod_winit = { git = "https://gitlab.com/veloren/conrod.git" }
-euc = "0.2"
+euc = "0.3.0"
 
 # ECS
-specs = "0.14"
+specs = "0.14.2"
 
 # Mathematics
-vek = "0.9"
+vek = "0.9.8"
 
 # discord
 discord-rpc-sdk = { git = "https://github.com/Songtronix/rust-discord-rpc.git", optional = true }
 
 # Utility
-glsl-include = "0.3"
+glsl-include = "0.3.1"
-failure = "0.1"
+failure = "0.1.5"
-lazy_static = "1.1"
+lazy_static = "1.3.0"
-log = "0.4"
+log = "0.4.7"
-dot_vox = "4.0"
+dot_vox = "4.0.0"
-image = "0.21"
+image = "0.22.0"
-serde = "1.0"
+serde = "1.0.97"
-serde_derive = "1.0"
+serde_derive = "1.0.97"
 ron = "0.5.1"
-guillotiere = "0.4"
+guillotiere = "0.4.2"
-fnv = "1.0"
+fnv = "1.0.6"
-simplelog = "0.5"
+simplelog = "0.6.0"
 msgbox = { git = "https://github.com/bekker/msgbox-rs.git" }
-directories = "1.0"
+directories = "2.0.2"
-portpicker = "0.1"
+portpicker = "0.1.0"
-num = "0.2"
+num = "0.2.0"
-backtrace = "0.3"
+backtrace = "0.3.33"
-rand = "0.5"
+rand = "0.7.0"
 frustum_query = "0.1.2"
 rodio = { git = "https://github.com/desttinghim/rodio.git", rev = "dd93f905c1afefaac03c496a666ecab27d3e391b"  }
-crossbeam = "^0.7.1"
+crossbeam = "0.7.2"
-fxhash = "0.2"
+fxhash = "0.2.1"
 heaptrack = "0.3.0"

voxygen/src/main.rs

@@ -37,7 +37,7 @@ use crate::{
 use heaptrack::track_mem;
 use log::{self, debug, error, info, warn};
 
-use simplelog::{CombinedLogger, Config, TermLogger, WriteLogger};
+use simplelog::{CombinedLogger, Config, TermLogger, TerminalMode, WriteLogger};
 use std::{fs::File, mem, panic, str::FromStr};
 
 track_mem!();
@@ -121,7 +121,7 @@ fn main() {
         .and_then(|s| log::LevelFilter::from_str(&s).ok())
         .unwrap_or(log::LevelFilter::Warn);
     CombinedLogger::init(vec![
-        TermLogger::new(term_log_level, Config::default()).unwrap(),
+        TermLogger::new(term_log_level, Config::default(), TerminalMode::Mixed).unwrap(),
         WriteLogger::new(
             log::LevelFilter::Info,
             Config::default(),

voxygen/src/ui/event.rs

@@ -4,7 +4,10 @@ use vek::*;
 #[derive(Clone)]
 pub struct Event(pub Input);
 impl Event {
-    pub fn try_from(event: glutin::Event, window: &glutin::GlWindow) -> Option<Self> {
+    pub fn try_from(
+        event: glutin::Event,
+        window: &glutin::ContextWrapper<glutin::PossiblyCurrent, winit::Window>,
+    ) -> Option<Self> {
         use conrod_winit::*;
         // A wrapper around the winit window that allows us to implement the trait necessary for
         // enabling the winit <-> conrod conversion functions.

voxygen/src/ui/graphic/graphic.rs

@@ -226,7 +226,7 @@ impl GraphicCache {
             if let Some(image) = self.soft_cache.get(&key) {
                 cacher(
                     target_aarb,
-                    &image.pixels().map(|p| p.data).collect::<Vec<[u8; 4]>>(),
+                    &image.pixels().map(|p| p.0).collect::<Vec<[u8; 4]>>(),
                 );
             } else {
                 error!("Image queued for transfer to gpu cache but it doesn't exist (this should never occur)");

voxygen/src/window.rs

@@ -74,7 +74,7 @@ pub enum KeyMouse {
 pub struct Window {
     events_loop: glutin::EventsLoop,
     renderer: Renderer,
-    window: glutin::GlWindow,
+    window: glutin::ContextWrapper<glutin::PossiblyCurrent, winit::Window>,
     cursor_grabbed: bool,
     pub pan_sensitivity: u32,
     pub zoom_sensitivity: u32,
@@ -193,7 +193,7 @@ impl Window {
 
         self.events_loop.poll_events(|event| {
             // Get events for ui.
-            if let Some(event) = ui::Event::try_from(event.clone(), &window) {
+            if let Some(event) = ui::Event::try_from(event.clone(), window) {
                 events.push(Event::Ui(event));
             }
 
@@ -202,7 +202,7 @@ impl Window {
                     glutin::WindowEvent::CloseRequested => events.push(Event::Close),
                     glutin::WindowEvent::Resized(glutin::dpi::LogicalSize { width, height }) => {
                         let (mut color_view, mut depth_view) = renderer.win_views_mut();
-                        gfx_window_glutin::update_views(&window, &mut color_view, &mut depth_view);
+                        gfx_window_glutin::update_views(window, &mut color_view, &mut depth_view);
                         renderer.on_resize().unwrap();
                         events.push(Event::Resize(Vec2::new(width as u32, height as u32)));
                     }
@@ -317,8 +317,8 @@ impl Window {
 
     pub fn grab_cursor(&mut self, grab: bool) {
         self.cursor_grabbed = grab;
-        self.window.hide_cursor(grab);
+        self.window.window().hide_cursor(grab);
-        let _ = self.window.grab_cursor(grab);
+        let _ = self.window.window().grab_cursor(grab);
     }
 
     pub fn is_fullscreen(&self) -> bool {
@@ -326,12 +326,12 @@ impl Window {
     }
 
     pub fn fullscreen(&mut self, fullscreen: bool) {
+        let window = self.window.window();
         self.fullscreen = fullscreen;
         if fullscreen {
-            self.window
+            window.set_fullscreen(Some(window.get_current_monitor()));
-                .set_fullscreen(Some(self.window.get_current_monitor()));
         } else {
-            self.window.set_fullscreen(None);
+            window.set_fullscreen(None);
         }
     }
 
@@ -342,6 +342,7 @@ impl Window {
     pub fn logical_size(&self) -> Vec2<f64> {
         let (w, h) = self
             .window
+            .window()
             .get_inner_size()
             .unwrap_or(glutin::dpi::LogicalSize::new(0.0, 0.0))
             .into();

world/Cargo.toml

@@ -6,11 +6,11 @@ edition = "2018"
 
 [dependencies]
 common = { package = "veloren-common", path = "../common" }
-vek = "0.9"
+vek = "0.9.8"
-noise = "0.5"
+noise = "0.5.1"
-fxhash = "0.2"
+fxhash = "0.2.1"
-lazy_static = "1.3"
+lazy_static = "1.3.0"
-rand = "0.5"
+rand = "0.5.0"
 
 [dev-dependencies]
 minifb = { git = "https://github.com/emoon/rust_minifb.git" }