From aa89f5a15ed489f6e3914a62972ddc14652c0f1c Mon Sep 17 00:00:00 2001
From: Stephen Waits <steve@waits.net>
Date: Fri, 3 Apr 2026 16:07:06 -0600
Subject: [PATCH] fix: resolve CI failures for fmt and MSRV lockfile
 compatibility

---
 .github/workflows/ci.yml | 8 ++++----
 Cargo.toml               | 2 +-
 src/wayland.rs           | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3f2c5f1..e231199 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rust: ["1.75", stable]
+        rust: ["1.85", stable]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
@@ -28,7 +28,7 @@ jobs:
   clippy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy
@@ -41,7 +41,7 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt
diff --git a/Cargo.toml b/Cargo.toml
index da9e306..7199694 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 keywords = ["wayland", "keyboard", "mouse", "accessibility", "navigation"]
 categories = ["command-line-utilities", "accessibility"]
 authors = ["Stephen Waits <steve@waits.net>"]
-rust-version = "1.75"
+rust-version = "1.85"
 
 [dependencies]
 anyhow = "1.0"
diff --git a/src/wayland.rs b/src/wayland.rs
index 36c6621..5f56bc5 100644
--- a/src/wayland.rs
+++ b/src/wayland.rs
@@ -647,7 +647,10 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandState {
             } => {
                 // Ignore bare modifier press events; we track modifiers via
                 // the Modifiers event instead.
-                if matches!(key, KEY_LSHIFT | KEY_RSHIFT | KEY_LCTRL | KEY_RCTRL | KEY_LALT | KEY_RALT) {
+                if matches!(
+                    key,
+                    KEY_LSHIFT | KEY_RSHIFT | KEY_LCTRL | KEY_RCTRL | KEY_LALT | KEY_RALT
+                ) {
                     return;
                 }
                 // Ctrl-[ acts as Escape (evdev keycode 26 = '[').