From c46c09f31d9f5169ca8a7e62406a9ea170e3a5c5 Mon Sep 17 00:00:00 2001
From: Lucas Fernandes Nogueira <lucas@tauri.studio>
Date: Fri, 17 Mar 2023 14:11:24 -0300
Subject: [PATCH] fix(deps): pin raw-window-handle to 0.5.0 (#6480)

* fix(deps): pin raw-window-handle to 0.5.0

* lint [skip ci]
---
 .changes/pin-raw-window-handle.md | 7 +++++++
 core/tauri-runtime-wry/Cargo.toml | 2 +-
 core/tauri-runtime/Cargo.toml     | 2 +-
 core/tauri-utils/src/assets.rs    | 3 +--
 core/tauri/Cargo.toml             | 2 +-
 core/tauri/src/app/tray.rs        | 1 +
 6 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 .changes/pin-raw-window-handle.md

diff --git a/.changes/pin-raw-window-handle.md b/.changes/pin-raw-window-handle.md
new file mode 100644
index 000000000..1eff4c8f2
--- /dev/null
+++ b/.changes/pin-raw-window-handle.md
@@ -0,0 +1,7 @@
+---
+"tauri": patch
+"tauri-runtime": patch
+"tauri-runtime-wry": patch
+---
+
+Pin raw-window-handle to 0.5.0 to keep MSRV.
diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml
index 15dd9f8c7..4f8a1fc96 100644
--- a/core/tauri-runtime-wry/Cargo.toml
+++ b/core/tauri-runtime-wry/Cargo.toml
@@ -18,7 +18,7 @@ tauri-runtime = { version = "0.12.1", path = "../tauri-runtime" }
 tauri-utils = { version = "1.2.1", path = "../tauri-utils" }
 uuid = { version = "1", features = [ "v4" ] }
 rand = "0.8"
-raw-window-handle = "0.5"
+raw-window-handle = "=0.5.0"
 
 [target."cfg(windows)".dependencies]
 webview2-com = "0.19.1"
diff --git a/core/tauri-runtime/Cargo.toml b/core/tauri-runtime/Cargo.toml
index 7fdc1afb2..609da1f83 100644
--- a/core/tauri-runtime/Cargo.toml
+++ b/core/tauri-runtime/Cargo.toml
@@ -30,7 +30,7 @@ tauri-utils = { version = "1.2.1", path = "../tauri-utils" }
 uuid = { version = "1", features = [ "v4" ] }
 http = "0.2.4"
 http-range = "0.1.4"
-raw-window-handle = "0.5"
+raw-window-handle = "=0.5.0"
 rand = "0.8"
 url = { version = "2" }
 
diff --git a/core/tauri-utils/src/assets.rs b/core/tauri-utils/src/assets.rs
index 8edcfd591..5b035a386 100644
--- a/core/tauri-utils/src/assets.rs
+++ b/core/tauri-utils/src/assets.rs
@@ -174,8 +174,7 @@ impl Assets for EmbeddedAssets {
             .get(html_path.as_ref())
             .copied()
             .into_iter()
-            .flatten()
-            .into_iter(),
+            .flatten(),
         )
         .copied(),
     )
diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml
index 9b492f4f7..63fad3a59 100644
--- a/core/tauri/Cargo.toml
+++ b/core/tauri/Cargo.toml
@@ -73,7 +73,7 @@ attohttpc = { version = "0.22", features = [ "compress", "json", "form" ], optio
 open = { version = "3.0", optional = true }
 shared_child = { version = "1.0", optional = true }
 os_pipe = { version = "1.0", optional = true }
-raw-window-handle = "0.5"
+raw-window-handle = "=0.5.0"
 minisign-verify = { version = "0.2", optional = true }
 time = { version = "=0.3.15", features = [ "parsing", "formatting" ], optional = true }
 os_info = { version = "=3.5.0", optional = true }
diff --git a/core/tauri/src/app/tray.rs b/core/tauri/src/app/tray.rs
index e6ba146a5..605c3181e 100644
--- a/core/tauri/src/app/tray.rs
+++ b/core/tauri/src/app/tray.rs
@@ -679,6 +679,7 @@ impl<R: Runtime> SystemTrayMenuItemHandle<R> {
       .map_err(Into::into)
   }
 
+  /// Sets the native image for this item.
   #[cfg(target_os = "macos")]
   #[cfg_attr(doc_cfg, doc(cfg(target_os = "macos")))]
   pub fn set_native_image(&self, image: crate::NativeImage) -> crate::Result<()> {