From 5768e1fd87effc063d325ce61eb0dfd167b88cb0 Mon Sep 17 00:00:00 2001
From: Victor Berger <victor.berger@m4x.org>
Date: Sun, 24 Feb 2019 08:50:21 +0100
Subject: [PATCH] Upgrade dependencies

---
 Cargo.toml         | 18 +++++++++---------
 anvil/Cargo.toml   |  8 ++++----
 anvil/src/shell.rs | 18 +++++++++---------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ef2e3d7..82c6c85 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,31 +15,31 @@ wayland-server = { version = "0.23", optional = true }
 wayland-commons = { version = "0.23", optional = true }
 wayland-sys = { version = "0.23", optional = true }
 calloop = "0.4.2"
-nix = "0.11"
-xkbcommon = "0.2.1"
-tempfile = "2.1.5"
+nix = "0.13"
+xkbcommon = "0.4.0"
+tempfile = "3.0"
 slog = "2.1.1"
 slog-stdlog = "3.0.2"
-libloading = "0.4.0"
+libloading = "0.5.0"
 wayland-client = { version = "0.23", features = ["egl"], optional = true }
 winit = { version = "0.18.0", optional = true }
 drm = { version = "^0.3.4", optional = true }
 gbm = { version = "^0.5.0", optional = true, default-features = false, features = ["drm-support"] }
-glium = { version = "0.19.0", optional = true, default-features = false }
+glium = { version = "0.23.0", optional = true, default-features = false }
 input = { version = "0.4.1", optional = true }
 udev = { version = "0.2.0", optional = true }
 dbus = { version = "0.6.1", optional = true }
-systemd = { version = "^0.2.0", optional = true }
+systemd = { version = "0.4.0", optional = true }
 wayland-protocols = { version = "0.23", features = ["unstable_protocols", "server"], optional = true }
-image = { version = "0.17.0", optional = true }
-error-chain = "0.11.0"
+image = { version = "0.21.0", optional = true }
+error-chain = "0.12.0"
 lazy_static = "1.0.0"
 
 [dev-dependencies]
 slog-term = "2.3"
 
 [build-dependencies]
-gl_generator = { version = "0.9", optional = true }
+gl_generator = { version = "0.10", optional = true }
 
 [features]
 default = ["backend_winit", "backend_drm_legacy", "backend_drm_gbm", "backend_drm_egl", "backend_libinput", "backend_udev", "backend_session", "renderer_glium", "xwayland", "wayland_frontend"]
diff --git a/anvil/Cargo.toml b/anvil/Cargo.toml
index e666cfd..08ef6bd 100644
--- a/anvil/Cargo.toml
+++ b/anvil/Cargo.toml
@@ -10,10 +10,10 @@ edition = "2018"
 slog = { version = "2.1.1" }
 slog-term = "2.3"
 slog-async = "2.2"
-rand = "0.3"
-glium = { version = "0.19.0", default-features = false }
+rand = "0.6"
+glium = { version = "0.23.0", default-features = false }
 wayland-server = "0.23"
-xkbcommon = "0.2.1"
+xkbcommon = "0.4.0"
 
 [dependencies.smithay]
 path = ".."
@@ -21,7 +21,7 @@ default-features = false
 features = [ "renderer_glium", "backend_egl", "wayland_frontend" ]
 
 [build-dependencies]
-gl_generator = "0.9"
+gl_generator = "0.10"
 
 [features]
 default = [ "winit", "egl", "udev" ]
diff --git a/anvil/src/shell.rs b/anvil/src/shell.rs
index a5c7284..54a8d18 100644
--- a/anvil/src/shell.rs
+++ b/anvil/src/shell.rs
@@ -76,11 +76,11 @@ pub fn init_shell(
         move |shell_event| match shell_event {
             XdgRequest::NewToplevel { surface } => {
                 // place the window at a random location in the [0;800]x[0;800] square
-                use rand::distributions::{IndependentSample, Range};
-                let range = Range::new(0, 800);
+                use rand::distributions::{Distribution, Uniform};
+                let range = Uniform::new(0, 800);
                 let mut rng = rand::thread_rng();
-                let x = range.ind_sample(&mut rng);
-                let y = range.ind_sample(&mut rng);
+                let x = range.sample(&mut rng);
+                let y = range.sample(&mut rng);
                 surface.send_configure(ToplevelConfigure {
                     size: None,
                     states: vec![],
@@ -111,12 +111,12 @@ pub fn init_shell(
                 kind: ShellSurfaceKind::Toplevel,
             } = req
             {
-                // place the window at a random location in the [0;300]x[0;300] square
-                use rand::distributions::{IndependentSample, Range};
-                let range = Range::new(0, 300);
+                // place the window at a random location in the [0;800]x[0;800] square
+                use rand::distributions::{Distribution, Uniform};
+                let range = Uniform::new(0, 800);
                 let mut rng = rand::thread_rng();
-                let x = range.ind_sample(&mut rng);
-                let y = range.ind_sample(&mut rng);
+                let x = range.sample(&mut rng);
+                let y = range.sample(&mut rng);
                 surface.send_configure((0, 0), wl_shell_surface::Resize::None);
                 shell_window_map
                     .borrow_mut()