diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs index 67935c47128446..35f27655061859 100644 --- a/crates/gpui/src/platform/linux/blade_renderer.rs +++ b/crates/gpui/src/platform/linux/blade_renderer.rs @@ -458,7 +458,7 @@ impl BladeRenderer { sprites, } => { let tex_info = self.atlas.get_texture_info(texture_id); - let instance_buf = self.instance_belt.alloc_data(&sprites, &self.gpu); + let instance_buf = self.instance_belt.alloc_data(sprites, &self.gpu); let mut encoder = pass.with(&self.pipelines.mono_sprites); encoder.bind( 0, @@ -476,7 +476,7 @@ impl BladeRenderer { sprites, } => { let tex_info = self.atlas.get_texture_info(texture_id); - let instance_buf = self.instance_belt.alloc_data(&sprites, &self.gpu); + let instance_buf = self.instance_belt.alloc_data(sprites, &self.gpu); let mut encoder = pass.with(&self.pipelines.poly_sprites); encoder.bind( 0, diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs index adcbac5487cb31..330cc84aa2edd9 100644 --- a/crates/gpui/src/platform/linux/platform.rs +++ b/crates/gpui/src/platform/linux/platform.rs @@ -49,8 +49,8 @@ pub(crate) struct LinuxPlatformInner { } pub(crate) struct LinuxPlatform { - client: Arc, - inner: Arc, + client: Rc, + inner: Rc, } pub(crate) struct LinuxPlatformState { @@ -93,7 +93,7 @@ impl LinuxPlatform { let client_dispatcher: Arc = Arc::new(WaylandClientDispatcher::new(&conn)); let dispatcher = Arc::new(LinuxDispatcher::new(main_sender, &client_dispatcher)); - let inner = Arc::new(LinuxPlatformInner { + let inner = Rc::new(LinuxPlatformInner { background_executor: BackgroundExecutor::new(dispatcher.clone()), foreground_executor: ForegroundExecutor::new(dispatcher.clone()), main_receiver, @@ -101,10 +101,10 @@ impl LinuxPlatform { callbacks, state, }); - let client = Arc::new(WaylandClient::new(Arc::clone(&inner), Arc::clone(&conn))); + let client = Rc::new(WaylandClient::new(Rc::clone(&inner), Arc::clone(&conn))); Self { client, - inner: Arc::clone(&inner), + inner: Rc::clone(&inner), } } @@ -135,7 +135,7 @@ impl LinuxPlatform { let client_dispatcher: Arc = Arc::new(X11ClientDispatcher::new(&xcb_connection, x_root_index)); let dispatcher = Arc::new(LinuxDispatcher::new(main_sender, &client_dispatcher)); - let inner = Arc::new(LinuxPlatformInner { + let inner = Rc::new(LinuxPlatformInner { background_executor: BackgroundExecutor::new(dispatcher.clone()), foreground_executor: ForegroundExecutor::new(dispatcher.clone()), main_receiver, @@ -143,15 +143,15 @@ impl LinuxPlatform { callbacks, state, }); - let client = Arc::new(X11Client::new( - Arc::clone(&inner), + let client = Rc::new(X11Client::new( + Rc::clone(&inner), xcb_connection, x_root_index, atoms, )); Self { client, - inner: Arc::clone(&inner), + inner: Rc::clone(&inner), } } } diff --git a/crates/gpui/src/platform/linux/wayland/client.rs b/crates/gpui/src/platform/linux/wayland/client.rs index 99680404aee4ae..f058833f4d0378 100644 --- a/crates/gpui/src/platform/linux/wayland/client.rs +++ b/crates/gpui/src/platform/linux/wayland/client.rs @@ -26,12 +26,12 @@ pub(crate) struct WaylandClientState { compositor: Option, buffer: Option, wm_base: Option, - windows: Vec<(xdg_surface::XdgSurface, Arc)>, - platform_inner: Arc, + windows: Vec<(xdg_surface::XdgSurface, Rc)>, + platform_inner: Rc, } pub(crate) struct WaylandClient { - platform_inner: Arc, + platform_inner: Rc, conn: Arc, state: Mutex, event_queue: Mutex>, @@ -39,16 +39,13 @@ pub(crate) struct WaylandClient { } impl WaylandClient { - pub(crate) fn new( - linux_platform_inner: Arc, - conn: Arc, - ) -> Self { + pub(crate) fn new(linux_platform_inner: Rc, conn: Arc) -> Self { let state = WaylandClientState { compositor: None, buffer: None, wm_base: None, windows: Vec::new(), - platform_inner: Arc::clone(&linux_platform_inner), + platform_inner: Rc::clone(&linux_platform_inner), }; let event_queue: EventQueue = conn.new_event_queue(); let qh = event_queue.handle(); @@ -109,14 +106,14 @@ impl Client for WaylandClient { wl_surface.frame(&self.qh, wl_surface.clone()); wl_surface.commit(); - let window_state: Arc = Arc::new(WaylandWindowState::new( + let window_state = Rc::new(WaylandWindowState::new( &self.conn, wl_surface.clone(), Arc::new(toplevel), options, )); - state.windows.push((xdg_surface, Arc::clone(&window_state))); + state.windows.push((xdg_surface, Rc::clone(&window_state))); Box::new(WaylandWindow(window_state)) } } diff --git a/crates/gpui/src/platform/linux/wayland/display.rs b/crates/gpui/src/platform/linux/wayland/display.rs index b0c7cd25e6d98a..0d8b6dbd3f8310 100644 --- a/crates/gpui/src/platform/linux/wayland/display.rs +++ b/crates/gpui/src/platform/linux/wayland/display.rs @@ -10,12 +10,12 @@ pub(crate) struct WaylandDisplay {} impl PlatformDisplay for WaylandDisplay { // todo!(linux) fn id(&self) -> DisplayId { - return DisplayId(123); // return some fake data so it doesn't panic + DisplayId(123) // return some fake data so it doesn't panic } // todo!(linux) fn uuid(&self) -> anyhow::Result { - return Ok(Uuid::from_bytes([0; 16])); // return some fake data so it doesn't panic + Ok(Uuid::from_bytes([0; 16])) // return some fake data so it doesn't panic } // todo!(linux) diff --git a/crates/gpui/src/platform/linux/wayland/window.rs b/crates/gpui/src/platform/linux/wayland/window.rs index 84c92d5e5346c1..1842ed7d26a519 100644 --- a/crates/gpui/src/platform/linux/wayland/window.rs +++ b/crates/gpui/src/platform/linux/wayland/window.rs @@ -181,7 +181,7 @@ impl WaylandWindowState { } #[derive(Clone)] -pub(crate) struct WaylandWindow(pub(crate) Arc); +pub(crate) struct WaylandWindow(pub(crate) Rc); impl HasWindowHandle for WaylandWindow { fn window_handle(&self) -> Result, HandleError> { @@ -212,7 +212,7 @@ impl PlatformWindow for WaylandWindow { // todo!(linux) fn scale_factor(&self) -> f32 { - return 1f32; + 1f32 } //todo!(linux) diff --git a/crates/gpui/src/platform/linux/x11/client.rs b/crates/gpui/src/platform/linux/x11/client.rs index c18d122c118c66..fca487fc3736a2 100644 --- a/crates/gpui/src/platform/linux/x11/client.rs +++ b/crates/gpui/src/platform/linux/x11/client.rs @@ -20,7 +20,7 @@ pub(crate) struct X11ClientState { } pub(crate) struct X11Client { - platform_inner: Arc, + platform_inner: Rc, xcb_connection: Arc, x_root_index: i32, atoms: XcbAtoms, @@ -29,7 +29,7 @@ pub(crate) struct X11Client { impl X11Client { pub(crate) fn new( - inner: Arc, + inner: Rc, xcb_connection: Arc, x_root_index: i32, atoms: XcbAtoms, diff --git a/crates/gpui/src/platform/linux/x11/window.rs b/crates/gpui/src/platform/linux/x11/window.rs index bfd13fb3637992..c834a951f1c4bd 100644 --- a/crates/gpui/src/platform/linux/x11/window.rs +++ b/crates/gpui/src/platform/linux/x11/window.rs @@ -248,7 +248,7 @@ impl X11WindowState { // Note: this has to be done after the GPU init, or otherwise // the sizes are immediately invalidated. - let gpu_extent = query_render_extent(&xcb_connection, x_window); + let gpu_extent = query_render_extent(xcb_connection, x_window); Self { xcb_connection: Arc::clone(xcb_connection), diff --git a/script/clippy b/script/clippy index 71dca2ffeffdf2..69b0bce192dbfc 100755 --- a/script/clippy +++ b/script/clippy @@ -6,4 +6,4 @@ set -euxo pipefail # so specify those here, and disable the rest until Zed's workspace # will have more fixes & suppression for the standard lint set cargo clippy --release --workspace --all-features --all-targets -- -A clippy::all -D clippy::dbg_macro -D clippy::todo -cargo clippy -p gpui +cargo clippy -p gpui -- -D warnings