diff --git a/crates/gpui/src/platform/mac/dispatcher.rs b/crates/gpui/src/platform/mac/dispatcher.rs index 72daa8c440..46afc14ba8 100644 --- a/crates/gpui/src/platform/mac/dispatcher.rs +++ b/crates/gpui/src/platform/mac/dispatcher.rs @@ -11,7 +11,12 @@ use objc::{ }; use parking::{Parker, Unparker}; use parking_lot::Mutex; -use std::{ffi::c_void, ptr::NonNull, sync::Arc, time::Duration}; +use std::{ + ffi::c_void, + ptr::{addr_of, NonNull}, + sync::Arc, + time::Duration, +}; /// All items in the generated file are marked as pub, so we're gonna wrap it in a separate mod to prevent /// these pub items from leaking into public API. @@ -21,7 +26,7 @@ pub(crate) mod dispatch_sys { use dispatch_sys::*; pub(crate) fn dispatch_get_main_queue() -> dispatch_queue_t { - unsafe { &_dispatch_main_q as *const _ as dispatch_queue_t } + unsafe { addr_of!(_dispatch_main_q) as *const _ as dispatch_queue_t } } pub(crate) struct MacDispatcher { diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs index 70e24030b1..d5d717e278 100644 --- a/crates/gpui/src/scene.rs +++ b/crates/gpui/src/scene.rs @@ -863,6 +863,3 @@ impl PathVertex { } } } - -#[derive(Copy, Clone, Debug)] -pub(crate) struct AtlasId(pub(crate) usize);