From c24619861eb88a1cdf72c62bed7dc87c1c558038 Mon Sep 17 00:00:00 2001
From: Victor Brekenfeld <github@drakulix.de>
Date: Sat, 8 Dec 2018 13:46:55 +0100
Subject: [PATCH] egl: style: move constraints into where clause

---
 src/backend/drm/egl/mod.rs     | 50 +++++++++++++++-------------------
 src/backend/drm/egl/session.rs |  9 +++---
 src/backend/drm/egl/surface.rs | 19 +++++++------
 3 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/src/backend/drm/egl/mod.rs b/src/backend/drm/egl/mod.rs
index c834875..b918427 100644
--- a/src/backend/drm/egl/mod.rs
+++ b/src/backend/drm/egl/mod.rs
@@ -32,21 +32,20 @@ pub use self::surface::*;
 pub mod session;
 
 /// Representation of an egl device to create egl rendering surfaces
-pub struct EglDevice<
+pub struct EglDevice<B, D>
+where
     B: Backend<Surface = <D as Device>::Surface> + 'static,
     D: Device + NativeDisplay<B, Arguments = crtc::Handle> + 'static,
-> where
     <D as Device>::Surface: NativeSurface,
 {
     dev: Rc<EGLContext<B, D>>,
     logger: ::slog::Logger,
 }
 
-impl<
-        B: Backend<Surface = <D as Device>::Surface> + 'static,
-        D: Device + NativeDisplay<B, Arguments = crtc::Handle> + 'static,
-    > AsRawFd for EglDevice<B, D>
+impl<B, D> AsRawFd for EglDevice<B, D>
 where
+    B: Backend<Surface = <D as Device>::Surface> + 'static,
+    D: Device + NativeDisplay<B, Arguments = crtc::Handle> + 'static,
     <D as Device>::Surface: NativeSurface,
 {
     fn as_raw_fd(&self) -> RawFd {
@@ -54,11 +53,10 @@ where
     }
 }
 
-impl<
-        B: Backend<Surface = <D as Device>::Surface> + 'static,
-        D: Device + NativeDisplay<B, Arguments = crtc::Handle> + 'static,
-    > EglDevice<B, D>
+impl<B, D> EglDevice<B, D>
 where
+    B: Backend<Surface = <D as Device>::Surface> + 'static,
+    D: Device + NativeDisplay<B, Arguments = crtc::Handle> + 'static,
     <D as Device>::Surface: NativeSurface,
 {
     /// Try to create a new `EglDevice` from an open device.
@@ -104,20 +102,19 @@ where
     }
 }
 
-struct InternalDeviceHandler<
+struct InternalDeviceHandler<B, D>
+where
     B: Backend<Surface = <D as Device>::Surface> + 'static,
     D: Device + NativeDisplay<B, Arguments = crtc::Handle> + 'static,
-> where
     <D as Device>::Surface: NativeSurface,
 {
     handler: Box<DeviceHandler<Device = EglDevice<B, D>> + 'static>,
 }
 
-impl<
-        B: Backend<Surface = <D as Device>::Surface> + 'static,
-        D: Device + NativeDisplay<B, Arguments = crtc::Handle> + 'static,
-    > DeviceHandler for InternalDeviceHandler<B, D>
+impl<B, D> DeviceHandler for InternalDeviceHandler<B, D>
 where
+    B: Backend<Surface = <D as Device>::Surface> + 'static,
+    D: Device + NativeDisplay<B, Arguments = crtc::Handle> + 'static,
     <D as Device>::Surface: NativeSurface,
 {
     type Device = D;
@@ -131,11 +128,10 @@ where
     }
 }
 
-impl<
-        B: Backend<Surface = <D as Device>::Surface> + 'static,
-        D: Device + NativeDisplay<B, Arguments = crtc::Handle> + 'static,
-    > Device for EglDevice<B, D>
+impl<B, D> Device for EglDevice<B, D>
 where
+    B: Backend<Surface = <D as Device>::Surface> + 'static,
+    D: Device + NativeDisplay<B, Arguments = crtc::Handle> + 'static,
     <D as Device>::Surface: NativeSurface,
 {
     type Surface = EglSurface<B, D>;
@@ -185,11 +181,10 @@ where
 }
 
 #[cfg(feature = "native_lib")]
-impl<
-        B: Backend<Surface = <D as Device>::Surface> + 'static,
-        D: Device + NativeDisplay<B, Arguments = crtc::Handle> + 'static,
-    > EGLGraphicsBackend for EglDevice<B, D>
+impl<B, D> EGLGraphicsBackend for EglDevice<B, D>
 where
+    B: Backend<Surface = <D as Device>::Surface> + 'static,
+    D: Device + NativeDisplay<B, Arguments = crtc::Handle> + 'static,
     <D as Device>::Surface: NativeSurface,
 {
     fn bind_wl_display(&self, display: &Display) -> EGLResult<EGLDisplay> {
@@ -197,11 +192,10 @@ where
     }
 }
 
-impl<
-        B: Backend<Surface = <D as Device>::Surface> + 'static,
-        D: Device + NativeDisplay<B, Arguments = crtc::Handle> + 'static,
-    > Drop for EglDevice<B, D>
+impl<B, D> Drop for EglDevice<B, D>
 where
+    B: Backend<Surface = <D as Device>::Surface> + 'static,
+    D: Device + NativeDisplay<B, Arguments = crtc::Handle> + 'static,
     <D as Device>::Surface: NativeSurface,
 {
     fn drop(&mut self) {
diff --git a/src/backend/drm/egl/session.rs b/src/backend/drm/egl/session.rs
index b07d8a9..0d6fc3f 100644
--- a/src/backend/drm/egl/session.rs
+++ b/src/backend/drm/egl/session.rs
@@ -18,12 +18,11 @@ pub struct EglDeviceObserver<S: SessionObserver + 'static> {
     observer: S,
 }
 
-impl<
-        S: SessionObserver + 'static,
-        B: Backend<Surface = <D as Device>::Surface> + 'static,
-        D: Device + NativeDisplay<B, Arguments = crtc::Handle> + AsSessionObserver<S> + 'static,
-    > AsSessionObserver<EglDeviceObserver<S>> for EglDevice<B, D>
+impl<S, B, D> AsSessionObserver<EglDeviceObserver<S>> for EglDevice<B, D>
 where
+    S: SessionObserver + 'static,
+    B: Backend<Surface = <D as Device>::Surface> + 'static,
+    D: Device + NativeDisplay<B, Arguments = crtc::Handle> + AsSessionObserver<S> + 'static,
     <D as Device>::Surface: NativeSurface,
 {
     fn observer(&mut self) -> EglDeviceObserver<S> {
diff --git a/src/backend/drm/egl/surface.rs b/src/backend/drm/egl/surface.rs
index 0c17a9b..064825e 100644
--- a/src/backend/drm/egl/surface.rs
+++ b/src/backend/drm/egl/surface.rs
@@ -13,19 +13,20 @@ use backend::graphics::PixelFormat;
 use backend::graphics::{CursorBackend, SwapBuffersError};
 
 /// Egl surface for rendering
-pub struct EglSurface<
+pub struct EglSurface<B, D>
+where
     B: Backend<Surface = <D as Device>::Surface> + 'static,
     D: Device + NativeDisplay<B> + 'static,
-> where
     <D as Device>::Surface: NativeSurface,
 {
     pub(super) dev: Rc<EGLContext<B, D>>,
     pub(super) surface: EGLSurface<B::Surface>,
 }
 
-impl<B: Backend<Surface = <D as Device>::Surface> + 'static, D: Device + NativeDisplay<B> + 'static> Surface
-    for EglSurface<B, D>
+impl<B, D> Surface for EglSurface<B, D>
 where
+    B: Backend<Surface = <D as Device>::Surface> + 'static,
+    D: Device + NativeDisplay<B> + 'static,
     <D as Device>::Surface: NativeSurface,
 {
     type Error = Error;
@@ -70,9 +71,10 @@ where
     }
 }
 
-impl<'a, B: Backend<Surface = <D as Device>::Surface> + 'static, D: Device + NativeDisplay<B> + 'static>
-    CursorBackend<'a> for EglSurface<B, D>
+impl<'a, B, D> CursorBackend<'a> for EglSurface<B, D>
 where
+    B: Backend<Surface = <D as Device>::Surface> + 'static,
+    D: Device + NativeDisplay<B> + 'static,
     <D as Device>::Surface: NativeSurface + CursorBackend<'a>,
 {
     type CursorFormat = <D::Surface as CursorBackend<'a>>::CursorFormat;
@@ -95,9 +97,10 @@ where
 }
 
 #[cfg(feature = "renderer_gl")]
-impl<B: Backend<Surface = <D as Device>::Surface> + 'static, D: Device + NativeDisplay<B> + 'static>
-    GLGraphicsBackend for EglSurface<B, D>
+impl<B, D> GLGraphicsBackend for EglSurface<B, D>
 where
+    B: Backend<Surface = <D as Device>::Surface> + 'static,
+    D: Device + NativeDisplay<B> + 'static,
     <D as Device>::Surface: NativeSurface,
 {
     fn swap_buffers(&self) -> ::std::result::Result<(), SwapBuffersError> {