cargo: Update dependencies

Cargo.toml

@@ -2,7 +2,7 @@
 name = "wldash"
 version = "0.3.0"
 authors = ["Kenny Levinsen <kl@kl.wtf>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = "fat"
@@ -20,31 +20,31 @@ alsa-widget = ["alsa"]
 pulseaudio-widget = ["libpulse-binding"]
 
 [dependencies]
-byteorder = "1.3"
-bitflags = "1.0"
-dlib = "0.4"
+byteorder = "1.4"
+bitflags = "1.3"
+dlib = "0.5"
 rusttype = "^0.9"
 chrono = "0.4"
-nix = "0.16"
+nix = "0.26"
 memmap = "0.7"
-os_pipe = "0.9"
-wayland-client = { version = "0.28"}
-wayland-protocols = { version = "0.28", features = ["client", "unstable_protocols"] }
+os_pipe = "1.1"
+wayland-client = { version = "0.29"}
+wayland-protocols = { version = "0.29", features = ["client", "unstable_protocols"] }
 dbus = "0.6"
 fuzzy-matcher = "0.3"
 lazy_static = "1.4"
-rcalc_lib = "0.9"
-rust-ini = "0.14"
-shlex = "0.1"
-timerfd = "1.0.0"
-walkdir = "2.3.2"
-itertools = "0.10.3"
+rcalc_lib = "1.0"
+rust-ini = "0.18"
+shlex = "1.1"
+timerfd = "1.4.0"
+walkdir = "2.3"
+itertools = "0.10"
 
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", optional = true }
-serde_yaml = { version = "0.8", optional = true }
+serde_yaml = { version = "0.9", optional = true }
 
-libpulse-binding = { version = "2.22", optional = true }
-alsa = { version = "0.4.0", optional = true }
-fontconfig = "0.5.0"
-unicode-segmentation = "1.6.0"
+libpulse-binding = { version = "2.26", optional = true }
+alsa = { version = "0.7.0", optional = true }
+fontconfig = "0.6.0"
+unicode-segmentation = "1.10.0"

src/app.rs

@@ -90,7 +90,7 @@ impl AppInner {
             _ => unreachable!(),
         });
 
-        shell_surface.set_keyboard_interactivity(1);
+        shell_surface.set_keyboard_interactivity(zwlr_layer_surface_v1::KeyboardInteractivity::Exclusive);
         shell_surface.set_size(1, 1);
         surface.set_buffer_scale(scale as i32);
         surface.commit();

src/doublemempool.rs

@@ -182,10 +182,9 @@ fn create_shm_fd() -> io::Result<RawFd> {
             memfd::MemFdCreateFlag::MFD_CLOEXEC,
         ) {
             Ok(fd) => return Ok(fd),
-            Err(nix::Error::Sys(Errno::EINTR)) => continue,
-            Err(nix::Error::Sys(Errno::ENOSYS)) => break,
-            Err(nix::Error::Sys(errno)) => return Err(io::Error::from(errno)),
-            Err(err) => unreachable!(err),
+            Err(Errno::EINTR) => continue,
+            Err(Errno::ENOSYS) => break,
+            Err(errno) => return Err(io::Error::from(errno)),
         }
     }
 
@@ -206,14 +205,12 @@ fn create_shm_fd() -> io::Result<RawFd> {
         ) {
             Ok(fd) => match mman::shm_unlink(mem_file_handle.as_str()) {
                 Ok(_) => return Ok(fd),
-                Err(nix::Error::Sys(errno)) => match unistd::close(fd) {
+                Err(errno) => match unistd::close(fd) {
                     Ok(_) => return Err(io::Error::from(errno)),
-                    Err(nix::Error::Sys(errno)) => return Err(io::Error::from(errno)),
-                    Err(err) => panic!("{}", err),
+                    Err(errno) => return Err(io::Error::from(errno)),
                 },
-                Err(err) => panic!("{}", err),
             },
-            Err(nix::Error::Sys(Errno::EEXIST)) => {
+            Err(Errno::EEXIST) => {
                 // If a file with that handle exists then change the handle
                 mem_file_handle = format!(
                     "/smithay-client-toolkit-{}",
@@ -221,9 +218,8 @@ fn create_shm_fd() -> io::Result<RawFd> {
                 );
                 continue;
             }
-            Err(nix::Error::Sys(Errno::EINTR)) => continue,
-            Err(nix::Error::Sys(errno)) => return Err(io::Error::from(errno)),
-            Err(err) => unreachable!(err),
+            Err(Errno::EINTR) => continue,
+            Err(errno) => return Err(io::Error::from(errno)),
         }
     }
 }

src/keyboard/ffi.rs

@@ -256,9 +256,11 @@ functions:
 
 lazy_static::lazy_static!(
     pub static ref XKBCOMMON_OPTION: Option<XkbCommon> = {
+        unsafe {
             XkbCommon::open("libxkbcommon.so.0")
             .or_else(|_| XkbCommon::open("libxkbcommon.so"))
             .ok()
+        }
     };
     pub static ref XKBCOMMON_HANDLE: &'static XkbCommon = {
         XKBCOMMON_OPTION.as_ref().expect("Library libxkbcommon.so could not be loaded.")

src/widgets/audio/alsa_sound.rs

@@ -15,11 +15,7 @@ const SELEM_ID: u32 = 0u32;
 fn alsa_error_to_io_error(fail: &'static str, err: &alsa::Error) -> ::std::io::Error {
     let kind = ::std::io::ErrorKind::Other;
     let func = err.func();
-    let errno = err
-        .errno()
-        .map(|errno| format!("; errno = {}", errno))
-        .unwrap_or_default();
-    ::std::io::Error::new(kind, format!("{}: {}{}", fail, func, errno))
+    ::std::io::Error::new(kind, format!("{}: {}{}", fail, func, err.errno()))
 }
 
 #[inline]

src/widgets/calendar.rs

@@ -221,7 +221,7 @@ impl<'a> Widget for Calendar<'a> {
         let cals = self.sections - 1;
         let pre_cals = cals / 2;
         for _ in 0..pre_cals {
-            t = t.pred().with_day(1).unwrap();
+            t = t.pred_opt().unwrap().with_day(1).unwrap();
         }
 
         if o != 0 {