Update smithay-client-toolkit to v0.18

nix/flake.nix

@@ -162,8 +162,12 @@
         buildInputs =
           buildInputs
           ++ (with pkgs.rust-bin; [
-            stable.latest.minimal
-            stable.latest.clippy
+            (stable.latest.minimal.override {
+              extensions = [
+                "clippy"
+                "rust-src"
+              ];
+            })
 
             nightly.latest.rustfmt
             nightly.latest.rust-analyzer

window/Cargo.toml

@@ -81,10 +81,10 @@ xcb-imdkit = { version="0.3", git="https://github.com/wez/xcb-imdkit-rs.git", re
 zbus = "3.14"
 zvariant = "3.15"
 
-smithay-client-toolkit = {version = "0.17.0", default-features=false, optional=true}
-wayland-protocols = {version="0.30", optional=true}
-wayland-client = {version="0.30", optional=true}
-wayland-egl = {version="0.30", optional=true}
+smithay-client-toolkit = {version = "0.18", default-features=false, optional=true}
+wayland-protocols = {version="0.31", optional=true}
+wayland-client = {version="0.31", optional=true}
+wayland-egl = {version="0.32", optional=true}
 
 [target.'cfg(target_os="macos")'.dependencies]
 cocoa = "0.25"

window/build.rs

@@ -8,7 +8,7 @@ fn main() {
 
     let dest = PathBuf::from(&env::var("OUT_DIR").unwrap());
     let target = env::var("TARGET").unwrap();
-    let mut file = File::create(&dest.join("egl_bindings.rs")).unwrap();
+    let mut file = File::create(dest.join("egl_bindings.rs")).unwrap();
     let reg = Registry::new(
         Api::Egl,
         (1, 5),
@@ -43,13 +43,13 @@ fn main() {
     }
 
     if target.contains("windows") {
-        let mut file = File::create(&dest.join("wgl_bindings.rs")).unwrap();
+        let mut file = File::create(dest.join("wgl_bindings.rs")).unwrap();
         let reg = Registry::new(Api::Wgl, (1, 0), Profile::Core, Fallbacks::All, []);
 
         reg.write_bindings(gl_generator::StructGenerator, &mut file)
             .unwrap();
 
-        let mut file = File::create(&dest.join("wgl_extra_bindings.rs")).unwrap();
+        let mut file = File::create(dest.join("wgl_extra_bindings.rs")).unwrap();
         Registry::new(
             Api::Wgl,
             (1, 0),

window/src/os/wayland/connection.rs

@@ -58,7 +58,7 @@ impl WaylandConnection {
         let mut events = Events::with_capacity(8);
 
         let wl_fd = {
-            let read_guard = self.event_queue.borrow().prepare_read()?;
+            let read_guard = self.event_queue.borrow().prepare_read().unwrap();
             read_guard.connection_fd().as_raw_fd()
         };
 
@@ -100,7 +100,7 @@ impl WaylandConnection {
                     continue;
                 }
 
-                if let Ok(guard) = event_q.prepare_read() {
+                if let Some(guard) = event_q.prepare_read() {
                     if let Err(err) = guard.read() {
                         log::trace!("Event Q error: {:?}", err);
                         if let WaylandError::Protocol(perr) = err {