diff --git a/core/tauri-runtime-wry/src/lib.rs b/core/tauri-runtime-wry/src/lib.rs index 5594e0f78..4a61ae427 100644 --- a/core/tauri-runtime-wry/src/lib.rs +++ b/core/tauri-runtime-wry/src/lib.rs @@ -378,6 +378,7 @@ impl From for NativeImageWrapper { #[derive(Debug, Clone)] pub struct GlobalShortcutWrapper(GlobalShortcut); +#[allow(clippy::non_send_fields_in_send_ty)] unsafe impl Send for GlobalShortcutWrapper {} /// Wrapper around [`WryShortcutManager`]. @@ -698,6 +699,7 @@ pub struct WindowBuilderWrapper { } // safe since `menu_items` are read only here +#[allow(clippy::non_send_fields_in_send_ty)] unsafe impl Send for WindowBuilderWrapper {} impl WindowBuilderBase for WindowBuilderWrapper {} diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index 5654f976b..acfd450ad 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -67,10 +67,10 @@ attohttpc = { version = "0.18", features = [ "json", "form" ] } open = { version = "2.0", optional = true } shared_child = { version = "1.0", optional = true } os_pipe = { version = "1.0", optional = true } -rfd = { version = "0.5.1", features = [ "parent" ] } -raw-window-handle = "0.3.3" +rfd = { version = "0.6.1", features = [ "parent" ] } +raw-window-handle = "0.4.1" minisign-verify = { version = "0.2", optional = true } -os_info = { version = "3.0.7", optional = true } +os_info = { version = "3.0.8", optional = true } futures-lite = "1.12" [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] diff --git a/core/tauri/src/window.rs b/core/tauri/src/window.rs index c2f2dca20..3a7e23421 100644 --- a/core/tauri/src/window.rs +++ b/core/tauri/src/window.rs @@ -102,18 +102,18 @@ pub struct Window { unsafe impl raw_window_handle::HasRawWindowHandle for Window { #[cfg(windows)] fn raw_window_handle(&self) -> raw_window_handle::RawWindowHandle { - let mut handle = raw_window_handle::windows::WindowsHandle::empty(); + let mut handle = raw_window_handle::Win32Handle::empty(); handle.hwnd = self.hwnd().expect("failed to get window `hwnd`"); - raw_window_handle::RawWindowHandle::Windows(handle) + raw_window_handle::RawWindowHandle::Win32(handle) } #[cfg(target_os = "macos")] fn raw_window_handle(&self) -> raw_window_handle::RawWindowHandle { - let mut handle = raw_window_handle::macos::MacOSHandle::empty(); + let mut handle = raw_window_handle::AppKitHandle::empty(); handle.ns_window = self .ns_window() .expect("failed to get window's `ns_window`"); - raw_window_handle::RawWindowHandle::MacOS(handle) + raw_window_handle::RawWindowHandle::AppKit(handle) } }