From a7a9498b5b166cfec87302d61a343ce51dafeb6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 10:15:52 +0000
Subject: [PATCH 1/2] build(deps): bump orbclient from 0.3.46 to 0.3.47

Bumps orbclient from 0.3.46 to 0.3.47.

---
updated-dependencies:
- dependency-name: orbclient
  dependency-type: indirect
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 474206af..5221f583 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1142,6 +1142,17 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "libredox"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
+dependencies = [
+ "bitflags 2.4.0",
+ "libc",
+ "redox_syscall 0.4.1",
+]
+
 [[package]]
 name = "lock_api"
 version = "0.4.10"
@@ -1496,11 +1507,11 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "orbclient"
-version = "0.3.46"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f"
+checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166"
 dependencies = [
- "redox_syscall",
+ "libredox",
 ]
 
 [[package]]
@@ -1560,7 +1571,7 @@ checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.3.5",
  "smallvec",
  "windows-targets 0.48.5",
 ]
@@ -1887,6 +1898,15 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "regex-automata"
 version = "0.3.9"
@@ -2858,7 +2878,7 @@ dependencies = [
  "orbclient",
  "percent-encoding",
  "raw-window-handle 0.5.2",
- "redox_syscall",
+ "redox_syscall 0.3.5",
  "sctk-adwaita 0.5.4",
  "smithay-client-toolkit",
  "wasm-bindgen",

From 5ab3eac043bc31384b485871e8496916624a6546 Mon Sep 17 00:00:00 2001
From: Martijn <garm@ilumeo.com>
Date: Mon, 6 Nov 2023 13:25:36 +0100
Subject: [PATCH 2/2] fix: Inline escape button press match guard

---
 src/backend_piston_window.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/backend_piston_window.rs b/src/backend_piston_window.rs
index a5c52f5d..2307626f 100644
--- a/src/backend_piston_window.rs
+++ b/src/backend_piston_window.rs
@@ -102,9 +102,13 @@ pub(crate) fn show(config: Config) -> MVResult<MiniView> {
                         window.close_window();
                         return Ok(());
                     }
-                    Event::Input(Input::Button(ButtonArgs { button, .. }), _)
-                        if button == Button::Keyboard(Key::Escape) =>
-                    {
+                    Event::Input(
+                        Input::Button(ButtonArgs {
+                            button: Button::Keyboard(Key::Escape),
+                            ..
+                        }),
+                        _,
+                    ) => {
                         window.close_window();
                         return Ok(());
                     }