From cc5d55f5354c93755b6949b49f3178aa5eecfc8b Mon Sep 17 00:00:00 2001
From: Victor Brekenfeld <github@drakulix.de>
Date: Sat, 15 Dec 2018 22:01:24 +0100
Subject: [PATCH] rustfmt fixes

---
 anvil/src/glium_drawer.rs    | 8 ++++----
 anvil/src/input_handler.rs   | 2 +-
 anvil/src/shell.rs           | 8 ++++----
 anvil/src/shm_load.rs        | 2 +-
 anvil/src/window_map.rs      | 2 +-
 anvil/src/winit.rs           | 2 +-
 src/wayland/shell/xdg/mod.rs | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/anvil/src/glium_drawer.rs b/anvil/src/glium_drawer.rs
index 1f17b5d..dc05b67 100644
--- a/anvil/src/glium_drawer.rs
+++ b/anvil/src/glium_drawer.rs
@@ -18,16 +18,16 @@ use smithay::{
         egl::{BufferAccessError, EGLImages, Format},
         graphics::{gl::GLGraphicsBackend, glium::GliumGraphicsBackend},
     },
+    reexports::wayland_server::{
+        protocol::{wl_buffer, wl_surface},
+        Resource,
+    },
     wayland::{
         compositor::{roles::Role, SubsurfaceRole, TraversalAction},
         data_device::DnDIconRole,
         seat::CursorImageRole,
         shm::with_buffer_contents as shm_buffer_contents,
     },
-    reexports::wayland_server::{
-        protocol::{wl_buffer, wl_surface},
-        Resource,
-    },
 };
 
 use crate::shaders;
diff --git a/anvil/src/input_handler.rs b/anvil/src/input_handler.rs
index 96d495b..78a8172 100644
--- a/anvil/src/input_handler.rs
+++ b/anvil/src/input_handler.rs
@@ -17,11 +17,11 @@ use smithay::{
         self, Event, InputBackend, InputHandler, KeyState, KeyboardKeyEvent, PointerAxisEvent,
         PointerButtonEvent, PointerMotionAbsoluteEvent, PointerMotionEvent,
     },
+    reexports::wayland_server::protocol::wl_pointer,
     wayland::{
         seat::{keysyms as xkb, AxisFrame, KeyboardHandle, Keysym, ModifiersState, PointerHandle},
         SERIAL_COUNTER as SCOUNTER,
     },
-    reexports::wayland_server::protocol::wl_pointer,
 };
 
 use crate::shell::MyWindowMap;
diff --git a/anvil/src/shell.rs b/anvil/src/shell.rs
index f96a5f0..9e6fe7c 100644
--- a/anvil/src/shell.rs
+++ b/anvil/src/shell.rs
@@ -7,6 +7,10 @@ use std::{
 use rand;
 
 use smithay::{
+    reexports::wayland_server::{
+        protocol::{wl_buffer, wl_callback, wl_shell_surface, wl_surface},
+        Display, Resource,
+    },
     wayland::{
         compositor::{compositor_init, CompositorToken, SurfaceAttributes, SurfaceEvent},
         data_device::DnDIconRole,
@@ -21,10 +25,6 @@ use smithay::{
             },
         },
     },
-    reexports::wayland_server::{
-        protocol::{wl_buffer, wl_callback, wl_shell_surface, wl_surface},
-        Display, Resource,
-    },
 };
 
 use crate::window_map::{Kind as SurfaceKind, WindowMap};
diff --git a/anvil/src/shm_load.rs b/anvil/src/shm_load.rs
index 38283b5..1a9f26e 100644
--- a/anvil/src/shm_load.rs
+++ b/anvil/src/shm_load.rs
@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use smithay::{wayland::shm::BufferData, reexports::wayland_server::protocol::wl_shm::Format};
+use smithay::{reexports::wayland_server::protocol::wl_shm::Format, wayland::shm::BufferData};
 
 use glium::texture::{ClientFormat, RawImage2d};
 
diff --git a/anvil/src/window_map.rs b/anvil/src/window_map.rs
index 9069c88..5c54f68 100644
--- a/anvil/src/window_map.rs
+++ b/anvil/src/window_map.rs
@@ -1,4 +1,5 @@
 use smithay::{
+    reexports::wayland_server::{protocol::wl_surface, Resource},
     utils::Rectangle,
     wayland::{
         compositor::{roles::Role, CompositorToken, SubsurfaceRole, SurfaceAttributes, TraversalAction},
@@ -7,7 +8,6 @@ use smithay::{
             xdg::{ToplevelSurface, XdgSurfaceRole},
         },
     },
-    reexports::wayland_server::{protocol::wl_surface, Resource},
 };
 
 pub enum Kind<U, R, SD, D> {
diff --git a/anvil/src/winit.rs b/anvil/src/winit.rs
index 9b5e04a..59cd608 100644
--- a/anvil/src/winit.rs
+++ b/anvil/src/winit.rs
@@ -6,13 +6,13 @@ use std::{
 
 use smithay::{
     backend::{egl::EGLGraphicsBackend, graphics::gl::GLGraphicsBackend, input::InputBackend, winit},
+    reexports::wayland_server::{calloop::EventLoop, protocol::wl_output, Display},
     wayland::{
         data_device::{default_action_chooser, init_data_device, set_data_device_focus, DataDeviceEvent},
         output::{Mode, Output, PhysicalProperties},
         seat::{CursorImageStatus, Seat, XkbConfig},
         shm::init_shm_global,
     },
-    reexports::wayland_server::{calloop::EventLoop, protocol::wl_output, Display},
 };
 
 use slog::Logger;
diff --git a/src/wayland/shell/xdg/mod.rs b/src/wayland/shell/xdg/mod.rs
index 4f0dca8..5ac3ee2 100644
--- a/src/wayland/shell/xdg/mod.rs
+++ b/src/wayland/shell/xdg/mod.rs
@@ -90,13 +90,13 @@
 //! the subhandler you provided, or via methods on the [`ShellState`](::wayland::shell::xdg::ShellState)
 //! that you are given (in an `Arc<Mutex<_>>`) as return value of the `init` function.
 
+use crate::utils::Rectangle;
+use crate::wayland::compositor::{roles::Role, CompositorToken};
 use std::{
     cell::RefCell,
     rc::Rc,
     sync::{Arc, Mutex},
 };
-use crate::utils::Rectangle;
-use crate::wayland::compositor::{roles::Role, CompositorToken};
 use wayland_protocols::{
     unstable::xdg_shell::v6::server::{zxdg_popup_v6, zxdg_shell_v6, zxdg_surface_v6, zxdg_toplevel_v6},
     xdg_shell::server::{xdg_popup, xdg_positioner, xdg_surface, xdg_toplevel, xdg_wm_base},