From e61d6ab07440e562166615e9430b53bce9d93a23 Mon Sep 17 00:00:00 2001 From: Julian Orth Date: Thu, 3 Nov 2022 19:26:35 +0100 Subject: [PATCH] all: fix clippy lints --- src/format.rs | 4 ++-- src/ifs/wl_surface.rs | 4 ++-- src/render/egl/display.rs | 2 +- src/wl_usr/usr_ifs/usr_linux_dmabuf.rs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/format.rs b/src/format.rs index a9d32d18..c5530b76 100644 --- a/src/format.rs +++ b/src/format.rs @@ -43,11 +43,11 @@ static PW_FORMATS_MAP: Lazy> = Lazy::n }); pub fn formats() -> &'static AHashMap { - &*FORMATS_MAP + &FORMATS_MAP } pub fn pw_formats() -> &'static AHashMap { - &*PW_FORMATS_MAP + &PW_FORMATS_MAP } const fn fourcc_code(a: char, b: char, c: char, d: char) -> u32 { diff --git a/src/ifs/wl_surface.rs b/src/ifs/wl_surface.rs index bcd32402..dba720d4 100644 --- a/src/ifs/wl_surface.rs +++ b/src/ifs/wl_surface.rs @@ -1155,7 +1155,7 @@ impl Node for WlSurface { } fn node_on_axis_event(self: Rc, seat: &Rc, event: &PendingScroll) { - seat.scroll_surface(&*self, event); + seat.scroll_surface(&self, event); } fn node_on_focus(self: Rc, seat: &Rc) { @@ -1179,7 +1179,7 @@ impl Node for WlSurface { } fn node_on_pointer_motion(self: Rc, seat: &Rc, x: Fixed, y: Fixed) { - seat.motion_surface(&*self, x, y) + seat.motion_surface(&self, x, y) } fn node_on_pointer_relative_motion( diff --git a/src/render/egl/display.rs b/src/render/egl/display.rs index b136a3e7..04520929 100644 --- a/src/render/egl/display.rs +++ b/src/render/egl/display.rs @@ -256,7 +256,7 @@ unsafe fn query_formats(dpy: EGLDisplay) -> Result, Ren res.insert( format.drm, EglFormat { - format: *format, + format, implicit_external_only: external_only, modifiers, }, diff --git a/src/wl_usr/usr_ifs/usr_linux_dmabuf.rs b/src/wl_usr/usr_ifs/usr_linux_dmabuf.rs index 3d9e636d..4c8de584 100644 --- a/src/wl_usr/usr_ifs/usr_linux_dmabuf.rs +++ b/src/wl_usr/usr_ifs/usr_linux_dmabuf.rs @@ -54,7 +54,7 @@ impl UsrLinuxDmabuf { if let Some(owner) = self.owner.get() { if let Some(format) = formats().get(&ev.format) { owner.modifier( - *format, + format, (ev.modifier_hi as u64) << 32 | (ev.modifier_lo as u64), ); }