From ce183a0f45155e7a8ef910fc899c09cf1c433f69 Mon Sep 17 00:00:00 2001
From: Julian Orth <ju.orth@gmail.com>
Date: Fri, 6 May 2022 16:47:54 +0200
Subject: [PATCH] all: run rustfmt

---
 src/backends/metal/video.rs         |  3 +--
 src/ifs/wl_buffer.rs                | 20 ++++++++++++--------
 src/ifs/wl_drm.rs                   |  8 +++++++-
 src/ifs/zwlr_screencopy_frame_v1.rs |  3 +--
 src/state.rs                        |  3 +--
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/backends/metal/video.rs b/src/backends/metal/video.rs
index 7162f4c0..e6aab9f2 100644
--- a/src/backends/metal/video.rs
+++ b/src/backends/metal/video.rs
@@ -8,7 +8,7 @@ use {
         edid::Descriptor,
         format::{Format, XRGB8888},
         ifs::wp_presentation_feedback::{KIND_HW_COMPLETION, KIND_VSYNC},
-        render::{Framebuffer, RenderContext, RenderResult, Texture},
+        render::{Framebuffer, RenderContext, RenderResult, ResetStatus, Texture},
         state::State,
         utils::{
             asyncevent::AsyncEvent, bitflags::BitflagsExt, clonecell::CloneCell,
@@ -37,7 +37,6 @@ use {
     },
     uapi::c,
 };
-use crate::render::ResetStatus;
 
 pub struct PendingDrmDevice {
     pub id: DrmId,
diff --git a/src/ifs/wl_buffer.rs b/src/ifs/wl_buffer.rs
index 7e87a5ee..509c4ab2 100644
--- a/src/ifs/wl_buffer.rs
+++ b/src/ifs/wl_buffer.rs
@@ -1,5 +1,3 @@
-use std::cell::RefCell;
-use std::ops::Deref;
 use {
     crate::{
         client::{Client, ClientError},
@@ -12,15 +10,18 @@ use {
         utils::{
             buffd::{MsgParser, MsgParserError},
             clonecell::CloneCell,
+            errorfmt::ErrorFmt,
         },
-        wire::{wl_buffer::*, WlBufferId},
+        video::dmabuf::DmaBuf,
+        wire::{jay_screenshot::Dmabuf, wl_buffer::*, WlBufferId},
+    },
+    std::{
+        cell::{Cell, RefCell},
+        ops::Deref,
+        rc::Rc,
     },
-    std::{cell::Cell, rc::Rc},
     thiserror::Error,
 };
-use crate::utils::errorfmt::ErrorFmt;
-use crate::video::dmabuf::DmaBuf;
-use crate::wire::jay_screenshot::Dmabuf;
 
 pub enum WlBufferStorage {
     Shm { mem: ClientMemOffset, stride: i32 },
@@ -135,7 +136,10 @@ impl WlBuffer {
             let image = match ctx.dmabuf_img(dmabuf) {
                 Ok(image) => image,
                 Err(e) => {
-                    log::error!("Cannot re-import wl_buffer after graphics context reset: {}", ErrorFmt(e));
+                    log::error!(
+                        "Cannot re-import wl_buffer after graphics context reset: {}",
+                        ErrorFmt(e)
+                    );
                     return;
                 }
             };
diff --git a/src/ifs/wl_drm.rs b/src/ifs/wl_drm.rs
index d4ce898d..8842b8ee 100644
--- a/src/ifs/wl_drm.rs
+++ b/src/ifs/wl_drm.rs
@@ -147,7 +147,13 @@ impl WlDrm {
             }
         }
         let img = ctx.dmabuf_img(&dmabuf)?;
-        let buffer = Rc::new(WlBuffer::new_dmabuf(req.id, &self.client, format, dmabuf, &img));
+        let buffer = Rc::new(WlBuffer::new_dmabuf(
+            req.id,
+            &self.client,
+            format,
+            dmabuf,
+            &img,
+        ));
         track!(self.client, buffer);
         self.client.add_client_obj(&buffer)?;
         Ok(())
diff --git a/src/ifs/zwlr_screencopy_frame_v1.rs b/src/ifs/zwlr_screencopy_frame_v1.rs
index ffd07dd3..ed480494 100644
--- a/src/ifs/zwlr_screencopy_frame_v1.rs
+++ b/src/ifs/zwlr_screencopy_frame_v1.rs
@@ -1,4 +1,3 @@
-use std::ops::Deref;
 use {
     crate::{
         client::{Client, ClientError},
@@ -16,7 +15,7 @@ use {
         },
         wire::{zwlr_screencopy_frame_v1::*, WlBufferId, ZwlrScreencopyFrameV1Id},
     },
-    std::{cell::Cell, rc::Rc},
+    std::{cell::Cell, ops::Deref, rc::Rc},
     thiserror::Error,
 };
 
diff --git a/src/state.rs b/src/state.rs
index f0b6369d..4a457eda 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -19,7 +19,7 @@ use {
             wl_seat::{SeatIds, WlSeatGlobal},
             wl_surface::{
                 zwp_idle_inhibitor_v1::{IdleInhibitorId, IdleInhibitorIds, ZwpIdleInhibitorV1},
-                NoneSurfaceExt,
+                NoneSurfaceExt, WlSurface,
             },
         },
         leaks::Tracker,
@@ -53,7 +53,6 @@ use {
         time::Duration,
     },
 };
-use crate::ifs::wl_surface::WlSurface;
 
 pub struct State {
     pub xkb_ctx: XkbContext,