Update deps + upgrade examples to rust 2018

imiklos · May 7, 2019 · 16cc03b · 16cc03b
1 parent 6b92c37
commit 16cc03b
Show file tree

Hide file tree

Showing 7 changed files with 262 additions and 249 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -5,6 +5,7 @@ authors = [
 	"Dzmitry Malyshau <[email protected]>",
 	"Joshua Groves <[email protected]>",
 ]
+edition = "2018"
 publish = false
 
 [[bin]]
@@ -26,4 +27,4 @@ vulkan = ["wgpu/vulkan"]
 [dependencies]
 wgpu-native = { path = "../wgpu-native" }
 wgpu = { path = "../wgpu-rs" }
-env_logger = "0.5"
+env_logger = "0.6"
diff --git a/examples/hello_compute_rust/main.rs b/examples/hello_compute_rust/main.rs
@@ -1,7 +1,3 @@
-extern crate env_logger;
-extern crate wgpu;
-extern crate wgpu_native;
-
 use std::str::FromStr;
 
 fn main() {

diff --git a/examples/hello_triangle_rust/main.rs b/examples/hello_triangle_rust/main.rs
@@ -1,6 +1,3 @@
-extern crate env_logger;
-extern crate wgpu;
-
 fn main() {
     env_logger::init();
 

diff --git a/gfx-examples/Cargo.toml b/gfx-examples/Cargo.toml
@@ -27,6 +27,6 @@ vulkan = ["wgpu/vulkan"]
 [dependencies]
 wgpu = { path = "../wgpu-rs" }
 cgmath = "0.17"
-env_logger = "0.5"
+env_logger = "0.6"
 glsl-to-spirv = "0.1"
 log = "0.4"
diff --git a/wgpu-native/Cargo.toml b/wgpu-native/Cargo.toml
@@ -28,7 +28,7 @@ bitflags = "1.0"
 copyless = "0.1"
 lazy_static = "1.1.0"
 log = "0.4"
-parking_lot = { version = "0.7" }
+parking_lot = { version = "0.8" }
 hal = { package = "gfx-hal", version = "0.1" }
 gfx-backend-empty = { version = "0.1.1" }
 gfx-backend-vulkan = { version = "0.1", optional = true }

diff --git a/wgpu-remote/Cargo.toml b/wgpu-remote/Cargo.toml
@@ -19,7 +19,7 @@ metal = ["wgpu-native/gfx-backend-metal"]
 
 [dependencies]
 wgpu-native = { path = "../wgpu-native", version = "0.2", features = ["remote"] }
-ipc-channel = "0.11"
+ipc-channel = "0.12"
 log = "0.4"
-parking_lot = { version = "0.7" }
+parking_lot = { version = "0.8" }
 serde = { version = "1.0", features = ["serde_derive"] }