From ebee5feb9ea74a7090fc2542f00ecba495e65da9 Mon Sep 17 00:00:00 2001
From: Victor Berger <victor.berger@m4x.org>
Date: Mon, 23 Apr 2018 18:26:17 +0200
Subject: [PATCH] wayland-rs 0.20.1 works around the rustc bug

---
 Cargo.toml                          | 8 ++++----
 examples/helpers/implementations.rs | 7 +++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 59f30d1..fae0421 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,15 +7,15 @@ description = "Smithay is a library for writing wayland compositors."
 repository = "https://github.com/Smithay/smithay"
 
 [dependencies]
-wayland-server = "0.20.0"
-wayland-sys = "0.20.0"
+wayland-server = "0.20.1"
+wayland-sys = "0.20.1"
 nix = "0.10.0"
 xkbcommon = "0.2.1"
 tempfile = "2.1.5"
 slog = { version = "2.1.1" }
 slog-stdlog = "3.0.2"
 libloading = "0.4.0"
-wayland-client = { version = "0.20.0", optional = true }
+wayland-client = { version = "0.20.1", optional = true }
 winit = { version = "0.10.0", optional = true }
 drm = { version = "^0.3.1", optional = true }
 gbm = { version = "^0.4.0", optional = true, default-features = false, features = ["drm-support"] }
@@ -24,7 +24,7 @@ input = { version = "0.4.0", optional = true }
 udev = { version = "0.2.0", optional = true }
 dbus = { version = "0.6.1", optional = true }
 systemd = { version = "^0.2.0", optional = true }
-wayland-protocols = { version = "0.20.0", features = ["unstable_protocols", "server"] }
+wayland-protocols = { version = "0.20.1", features = ["unstable_protocols", "server"] }
 image = "0.17.0"
 error-chain = "0.11.0"
 lazy_static = "1.0.0"
diff --git a/examples/helpers/implementations.rs b/examples/helpers/implementations.rs
index 4d78bc9..d494bb9 100644
--- a/examples/helpers/implementations.rs
+++ b/examples/helpers/implementations.rs
@@ -119,10 +119,9 @@ pub fn init_shell(
         looptoken.clone(),
         move |request, (surface, ctoken)| match request {
             SurfaceEvent::Commit => surface_commit(&surface, ctoken, &*c_egl_display),
-            SurfaceEvent::Frame { callback } => {
-                // TODO: uncomment when https://github.com/rust-lang/rust/issues/50153 is fixed
-                // callback.implement(|e, _| match e {}, None::<fn(_,_)>).send(wl_callback::Event::Done { callback_data: 0})
-            }
+            SurfaceEvent::Frame { callback } => callback
+                .implement(|e, _| match e {}, None::<fn(_, _)>)
+                .send(wl_callback::Event::Done { callback_data: 0 }),
         },
         log.clone(),
     );