Fix clippy after cherry-pick

Conrad Irwin created 1 month ago

Release Notes:

- n/a

Change summary

crates/gpui/Cargo.toml                           | 1 +
crates/gpui/src/platform/linux/platform.rs       | 4 ++--
crates/gpui/src/platform/linux/wayland/client.rs | 2 +-
crates/gpui/src/platform/linux/x11/client.rs     | 3 +--
4 files changed, 5 insertions(+), 5 deletions(-)

Detailed changes

crates/gpui/Cargo.toml

@@ -205,6 +205,7 @@ x11rb = { version = "0.13.1", features = [
     "cursor",
     "resource_manager",
     "sync",
+    "dri3",
 ], optional = true }
 # WARNING: If you change this, you must also publish a new version of zed-xim to crates.io
 xim = { git = "https://github.com/zed-industries/xim-rs.git", rev = "16f35a2c881b815a2b6cdfd6687988e84f8447d8" , features = [

crates/gpui/src/platform/linux/platform.rs

@@ -1028,7 +1028,7 @@ impl crate::Capslock {
 /// [`CompositorGpuHint`] that the GPU adapter selection code can use to
 /// prioritize the compositor's rendering device.
 #[cfg(any(feature = "wayland", feature = "x11"))]
-pub(super) fn compositor_gpu_hint_from_dev_t(dev: u64) -> Option<gpui_wgpu::CompositorGpuHint> {
+pub(super) fn compositor_gpu_hint_from_dev_t(dev: u64) -> Option<super::wgpu::CompositorGpuHint> {
     fn dev_major(dev: u64) -> u32 {
         ((dev >> 8) & 0xfff) as u32 | (((dev >> 32) & !0xfff) as u32)
     }
@@ -1058,7 +1058,7 @@ pub(super) fn compositor_gpu_hint_from_dev_t(dev: u64) -> Option<gpui_wgpu::Comp
         device_id,
     );
 
-    Some(gpui_wgpu::CompositorGpuHint {
+    Some(super::wgpu::CompositorGpuHint {
         vendor_id,
         device_id,
     })

crates/gpui/src/platform/linux/wayland/client.rs

@@ -977,7 +977,7 @@ fn detect_compositor_gpu() -> Option<CompositorGpuHint> {
     feedback.destroy();
     dmabuf.destroy();
 
-    crate::linux::compositor_gpu_hint_from_dev_t(state.device?)
+    super::compositor_gpu_hint_from_dev_t(state.device?)
 }
 
 impl Dispatch<wl_registry::WlRegistry, GlobalListContents> for WaylandClientStatePtr {

crates/gpui/src/platform/linux/x11/client.rs

@@ -58,7 +58,6 @@ use crate::platform::{
         reveal_path_internal,
         xdg_desktop_portal::{Event as XDPEvent, XDPEventSource},
     },
-    wgpu::WgpuContext,
 };
 use crate::{
     AnyWindowHandle, Bounds, ClipboardItem, CursorStyle, DisplayId, FileDropEvent, Keystroke,
@@ -1993,7 +1992,7 @@ fn detect_compositor_gpu(
     let path = format!("/proc/self/fd/{}", fd.as_raw_fd());
     let metadata = std::fs::metadata(&path).ok()?;
 
-    crate::linux::compositor_gpu_hint_from_dev_t(metadata.rdev())
+    super::compositor_gpu_hint_from_dev_t(metadata.rdev())
 }
 
 fn check_compositor_present(xcb_connection: &XCBConnection, root: xproto::Window) -> bool {