From dc7f9bbc5492cad63fbda8371298b85e296d287f Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Sat, 6 Jan 2024 23:47:51 +0100 Subject: [PATCH] gpui: Sweep through cargo doc output and mark dubious items as non-public (#3932) I essentially went through the publicly exported items and marked these that are e.g. leaky reexports as pub(crate). I expect that'd be done on Tuesday anyways. Release Notes: - N/A --- crates/gpui/src/gpui.rs | 2 +- crates/gpui/src/platform.rs | 2 +- crates/gpui/src/platform/mac.rs | 18 ------------------ crates/gpui/src/platform/mac/dispatcher.rs | 9 +++++++-- crates/gpui/src/platform/mac/display.rs | 2 +- crates/gpui/src/platform/mac/platform.rs | 5 +---- crates/gpui/src/platform/mac/text_system.rs | 4 ++-- crates/gpui/src/text_system.rs | 2 +- 8 files changed, 14 insertions(+), 30 deletions(-) diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs index 2697a622c350d9b485df61fd7f96c40bbc663cf2..868822d59bda9cd42e4ba9857fd7a95910bab59f 100644 --- a/crates/gpui/src/gpui.rs +++ b/crates/gpui/src/gpui.rs @@ -47,7 +47,7 @@ pub use element::*; pub use elements::*; pub use executor::*; pub use geometry::*; -pub use gpui_macros::*; +pub use gpui_macros::{register_action, test, IntoElement, Render}; pub use image_cache::*; pub use input::*; pub use interactive::*; diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs index 0c4581904f42b19f99ac73300d8dd60721939fe4..0ef345d98d1de34bbb7c6b567b4716608e2e6dbf 100644 --- a/crates/gpui/src/platform.rs +++ b/crates/gpui/src/platform.rs @@ -37,7 +37,7 @@ pub use keystroke::*; pub use mac::*; #[cfg(any(test, feature = "test-support"))] pub use test::*; -pub use time::UtcOffset; +use time::UtcOffset; #[cfg(target_os = "macos")] pub(crate) fn current_platform() -> Rc { diff --git a/crates/gpui/src/platform/mac.rs b/crates/gpui/src/platform/mac.rs index d10793a618683ad3c1aa76bef860c468dfce2229..8f48b8ea94d8aa2193545267dd3d85a021a9f96c 100644 --- a/crates/gpui/src/platform/mac.rs +++ b/crates/gpui/src/platform/mac.rs @@ -106,11 +106,6 @@ impl From for Size { } } -pub trait NSRectExt { - fn size(&self) -> Size; - fn intersects(&self, other: Self) -> bool; -} - impl From for Size { fn from(rect: NSRect) -> Self { let NSSize { width, height } = rect.size; @@ -124,16 +119,3 @@ impl From for Size { size(width.into(), height.into()) } } - -// impl NSRectExt for NSRect { -// fn intersects(&self, other: Self) -> bool { -// self.size.width > 0. -// && self.size.height > 0. -// && other.size.width > 0. -// && other.size.height > 0. -// && self.origin.x <= other.origin.x + other.size.width -// && self.origin.x + self.size.width >= other.origin.x -// && self.origin.y <= other.origin.y + other.size.height -// && self.origin.y + self.size.height >= other.origin.y -// } -// } diff --git a/crates/gpui/src/platform/mac/dispatcher.rs b/crates/gpui/src/platform/mac/dispatcher.rs index 06bef49b7a96644695874a0aff2aca43f939a209..18e361885e71d58a8328bb6dc38c1b6b2d286041 100644 --- a/crates/gpui/src/platform/mac/dispatcher.rs +++ b/crates/gpui/src/platform/mac/dispatcher.rs @@ -13,9 +13,14 @@ use parking::{Parker, Unparker}; use parking_lot::Mutex; use std::{ffi::c_void, ptr::NonNull, sync::Arc, time::Duration}; -include!(concat!(env!("OUT_DIR"), "/dispatch_sys.rs")); +/// 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. +pub(crate) mod dispatch_sys { + include!(concat!(env!("OUT_DIR"), "/dispatch_sys.rs")); +} -pub fn dispatch_get_main_queue() -> dispatch_queue_t { +use dispatch_sys::*; +pub(crate) fn dispatch_get_main_queue() -> dispatch_queue_t { unsafe { &_dispatch_main_q as *const _ as dispatch_queue_t } } diff --git a/crates/gpui/src/platform/mac/display.rs b/crates/gpui/src/platform/mac/display.rs index 2458533f6a3e45a6c0f7789135a8780669012d8c..123cbf8159be02b0496bf8e3656f837e63b03bd4 100644 --- a/crates/gpui/src/platform/mac/display.rs +++ b/crates/gpui/src/platform/mac/display.rs @@ -51,7 +51,7 @@ impl MacDisplay { #[link(name = "ApplicationServices", kind = "framework")] extern "C" { - pub fn CGDisplayCreateUUIDFromDisplayID(display: CGDirectDisplayID) -> CFUUIDRef; + fn CGDisplayCreateUUIDFromDisplayID(display: CGDirectDisplayID) -> CFUUIDRef; } /// Convert the given rectangle from CoreGraphics' native coordinate space to GPUI's coordinate space. diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs index ff89f91730ae5d33e6720f1c9723ed8f2741f0ad..8370e2a4953c1280a59d4a9cb74a93ae97214db2 100644 --- a/crates/gpui/src/platform/mac/platform.rs +++ b/crates/gpui/src/platform/mac/platform.rs @@ -56,9 +56,6 @@ use time::UtcOffset; #[allow(non_upper_case_globals)] const NSUTF8StringEncoding: NSUInteger = 4; -#[allow(non_upper_case_globals)] -pub const NSViewLayerContentsRedrawDuringViewResize: NSInteger = 2; - const MAC_PLATFORM_IVAR: &str = "platform"; static mut APP_CLASS: *const Class = ptr::null(); static mut APP_DELEGATE_CLASS: *const Class = ptr::null(); @@ -404,7 +401,7 @@ impl Platform for MacPlatform { // this, we make quitting the application asynchronous so that we aren't holding borrows to // the app state on the stack when we actually terminate the app. - use super::dispatcher::{dispatch_async_f, dispatch_get_main_queue}; + use super::dispatcher::{dispatch_get_main_queue, dispatch_sys::dispatch_async_f}; unsafe { dispatch_async_f(dispatch_get_main_queue(), ptr::null_mut(), Some(quit)); diff --git a/crates/gpui/src/platform/mac/text_system.rs b/crates/gpui/src/platform/mac/text_system.rs index 88ebfd83514949bbe56e661ec5c42da053814d50..d9f7936066b248a7037fb2ea810b7c4a5dc431d2 100644 --- a/crates/gpui/src/platform/mac/text_system.rs +++ b/crates/gpui/src/platform/mac/text_system.rs @@ -500,9 +500,9 @@ impl<'a> StringIndexConverter<'a> { } #[repr(C)] -pub struct __CFTypesetter(c_void); +pub(crate) struct __CFTypesetter(c_void); -pub type CTTypesetterRef = *const __CFTypesetter; +type CTTypesetterRef = *const __CFTypesetter; #[link(name = "CoreText", kind = "framework")] extern "C" { diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs index 3106a5a961514157d2daf4d0360c395fae45c2df..0969560e95d62e6d74dc82e88eb4b13958a77480 100644 --- a/crates/gpui/src/text_system.rs +++ b/crates/gpui/src/text_system.rs @@ -33,7 +33,7 @@ pub struct FontId(pub usize); #[derive(Hash, PartialEq, Eq, Clone, Copy, Debug)] pub struct FontFamilyId(pub usize); -pub const SUBPIXEL_VARIANTS: u8 = 4; +pub(crate) const SUBPIXEL_VARIANTS: u8 = 4; pub struct TextSystem { line_layout_cache: Arc,