chore: target os import

tauri-apps · Jul 10, 2024 · 17287ab · 17287ab
1 parent 2fb6be9
commit 17287ab
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/examples/reparent.rs b/examples/reparent.rs
@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use objc2::rc::Retained;
-use objc2_app_kit::NSWindow;
 use tao::{
   event::{ElementState, Event, KeyEvent, WindowEvent},
   event_loop::{ControlFlow, EventLoop},
@@ -13,7 +11,10 @@ use tao::{
 use wry::WebViewBuilder;
 
 #[cfg(target_os = "macos")]
-use {tao::platform::macos::WindowExtMacOS, wry::WebViewExtMacOS};
+use {
+  objc2::rc::Retained, objc2_app_kit::NSWindow, tao::platform::macos::WindowExtMacOS,
+  wry::WebViewExtMacOS,
+};
 #[cfg(target_os = "windows")]
 use {tao::platform::windows::WindowExtWindows, wry::WebViewExtWindows};
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -222,15 +222,18 @@ use android::*;
 
 #[cfg(gtk)]
 pub(crate) mod webkitgtk;
-use objc2::rc::Retained;
-use objc2_app_kit::NSWindow;
-use objc2_web_kit::WKUserContentController;
 /// Re-exported [raw-window-handle](https://docs.rs/raw-window-handle/latest/raw_window_handle/) crate.
 pub use raw_window_handle;
 use raw_window_handle::HasWindowHandle;
 #[cfg(gtk)]
 use webkitgtk::*;
 
+#[cfg(any(target_os = "macos", target_os = "ios"))]
+use objc2::rc::Retained;
+#[cfg(any(target_os = "macos", target_os = "ios"))]
+use objc2_app_kit::NSWindow;
+#[cfg(any(target_os = "macos", target_os = "ios"))]
+use objc2_web_kit::WKUserContentController;
 #[cfg(any(target_os = "macos", target_os = "ios"))]
 pub(crate) mod wkwebview;
 #[cfg(any(target_os = "macos", target_os = "ios"))]

diff --git a/src/wkwebview/mod.rs b/src/wkwebview/mod.rs
@@ -196,7 +196,8 @@ impl InnerWebView {
     ) {
       unsafe {
         #[cfg(feature = "tracing")]
-        tracing::info_span!(parent: None, "wry::custom_protocol::handle", uri = tracing::field::Empty).entered();
+        let span = tracing::info_span!(parent: None, "wry::custom_protocol::handle", uri = tracing::field::Empty)
+          .entered();
 
         let task_key = (*task).hash(); // hash by task object address
         let task_uuid = (*webview).add_custom_task_key(task_key);