cleanup

Author: prokopyl

src/platform/macos/context.rs

@@ -1,4 +1,3 @@
-use crate::gl::GlContext;
 use crate::platform::macos::cursor::Cursor;
 use crate::platform::macos::view::BaseviewView;
 use crate::wrappers::appkit::{View, ViewRef};
@@ -65,15 +64,15 @@ impl WindowContext {
     }
 
     #[cfg(feature = "opengl")]
-    pub fn gl_context(&self) -> Option<GlContext> {
-        Some(GlContext::new(self.view.load()?.inner().gl_context.get()?.clone()))
+    pub fn gl_context(&self) -> Option<crate::gl::GlContext> {
+        Some(crate::gl::GlContext::new(self.view.load()?.inner().gl_context.get()?.clone()))
     }
 
-    pub fn window_handle(&self) -> Option<raw_window_handle::WindowHandle> {
+    pub fn window_handle(&self) -> Option<raw_window_handle::WindowHandle<'_>> {
         View::window_handle_from_weak(&self.view)
     }
 
-    pub fn display_handle(&self) -> DisplayHandle {
+    pub fn display_handle(&self) -> DisplayHandle<'_> {
         DisplayHandle::appkit()
     }
 }

src/platform/macos/window.rs

@@ -2,24 +2,16 @@ use std::cell::{Cell, RefCell};
 use std::rc::Rc;
 
 use objc2::rc::{autoreleasepool, Weak};
-use objc2::runtime::NSObjectProtocol;
 use objc2::MainThreadMarker;
 use objc2_app_kit::{
     NSApplication, NSApplicationActivationPolicy, NSPasteboard, NSPasteboardTypeString,
 };
 use objc2_foundation::NSString;
-use raw_window_handle::{
-    AppKitDisplayHandle, AppKitWindowHandle, HasRawDisplayHandle, HasRawWindowHandle,
-    HasWindowHandle, RawDisplayHandle, RawWindowHandle,
-};
-
-use super::cursor::Cursor;
-use crate::{MouseCursor, Size, WindowContext, WindowHandler, WindowInfo, WindowOpenOptions};
+use raw_window_handle::HasWindowHandle;
 
-#[cfg(feature = "opengl")]
-use crate::gl::GlContext;
 use crate::platform::macos::view::{BaseviewView, ViewParentingType};
-use crate::wrappers::appkit::{create_window, extract_raw_window_handle, View, ViewRef};
+use crate::wrappers::appkit::{create_window, extract_raw_window_handle, View};
+use crate::{WindowContext, WindowHandler, WindowInfo, WindowOpenOptions};
 
 pub struct WindowHandle {
     view: RefCell<Option<Weak<View<BaseviewView>>>>,

src/wrappers/appkit.rs

@@ -31,7 +31,5 @@ pub fn extract_raw_window_handle(handle: WindowHandle) -> Option<Retained<NSView
         panic!("Not a macOS window");
     };
 
-    let parent_view = unsafe { Retained::retain(handle.ns_view.as_ptr() as *mut NSView) };
-
-    parent_view
+    unsafe { Retained::retain(handle.ns_view.as_ptr() as *mut NSView) }
 }

src/wrappers/appkit/view.rs

@@ -86,9 +86,9 @@ impl<V: ViewImpl> View<V> {
         ViewRef { view: self, inner: self.inner() }
     }
 
-    pub fn window_handle_from_weak(this: &Weak<Self>) -> Option<WindowHandle> {
+    pub fn window_handle_from_weak(this: &Weak<Self>) -> Option<WindowHandle<'_>> {
         let view = this.load()?;
-        let ns_view = NonNull::from_ref(&view.parent).cast();
+        let ns_view = NonNull::from(&view.parent).cast();
         let handle = AppKitWindowHandle::new(ns_view);
 
         Some(unsafe { WindowHandle::borrow_raw(handle.into()) })