diff --git a/src/backend/drm/backend.rs b/src/backend/drm/backend.rs
index 3410e55..81ac918 100644
--- a/src/backend/drm/backend.rs
+++ b/src/backend/drm/backend.rs
@@ -171,11 +171,11 @@ impl<A: Device + 'static> DrmBackend<A> {
             if !encoders
                 .iter()
                 .map(|encoder| encoder.possible_crtcs())
-                .all(|crtc_list| {
+                .all(|crtc_list|
                     resource_handles
                         .filter_crtcs(crtc_list)
                         .contains(&self.backend.crtc)
-                }) {
+                ) {
                 bail!(ErrorKind::NoSuitableEncoder(info, self.backend.crtc));
             }
 
@@ -473,12 +473,13 @@ impl<A: Device + 'static> GraphicsBackend for DrmBackend<A> {
 
 impl<A: Device + 'static> EGLGraphicsBackend for DrmBackend<A> {
     fn swap_buffers(&self) -> ::std::result::Result<(), SwapBuffersError> {
-        if {
+        let res = {
             let nb = self.backend.next_buffer.take();
             let res = nb.is_some();
             self.backend.next_buffer.set(nb);
             res
-        } {
+        };
+        if res {
             // We cannot call lock_front_buffer anymore without releasing the previous buffer, which will happen when the page flip is done
             warn!(
                 self.backend.logger,
diff --git a/src/backend/graphics/egl/native.rs b/src/backend/graphics/egl/native.rs
index cb8a54b..029713c 100644
--- a/src/backend/graphics/egl/native.rs
+++ b/src/backend/graphics/egl/native.rs
@@ -179,7 +179,7 @@ unsafe impl NativeDisplay<X11> for WinitWindow {
 
     fn create_surface(&self, _args: ()) -> Result<XlibWindow> {
         self.get_xlib_window()
-            .map(|ptr| XlibWindow(ptr))
+            .map(XlibWindow)
             .ok_or(ErrorKind::NonMatchingBackend("X11").into())
     }
 }
diff --git a/src/backend/session/direct.rs b/src/backend/session/direct.rs
index 657976d..87dd653 100644
--- a/src/backend/session/direct.rs
+++ b/src/backend/session/direct.rs
@@ -177,7 +177,7 @@ impl DirectSession {
                 fcntl::OFlag::O_RDWR | fcntl::OFlag::O_CLOEXEC,
                 Mode::empty(),
             ).chain_err(|| ErrorKind::FailedToOpenTTY(String::from(path.to_string_lossy())))
-        }).unwrap_or(dup(0 /*stdin*/).chain_err(|| ErrorKind::FailedToOpenTTY(String::from("<stdin>"))))?;
+        }).unwrap_or_else(|| dup(0 /*stdin*/).chain_err(|| ErrorKind::FailedToOpenTTY(String::from("<stdin>"))))?;
 
         let active = Arc::new(AtomicBool::new(true));
 
diff --git a/src/wayland/seat/pointer.rs b/src/wayland/seat/pointer.rs
index 9ed7a5d..47aeabe 100644
--- a/src/wayland/seat/pointer.rs
+++ b/src/wayland/seat/pointer.rs
@@ -138,7 +138,7 @@ impl PointerHandle {
     ///
     /// A single frame will group multiple scroll events as if they happended in the same instance.
     /// Dropping the returned `PointerAxisHandle` will group the events together.
-    pub fn axis<'a>(&'a self) -> PointerAxisHandle<'a> {
+    pub fn axis(& self) -> PointerAxisHandle {
         PointerAxisHandle {
             inner: self.inner.lock().unwrap(),
         }
diff --git a/src/xwayland/x11_sockets.rs b/src/xwayland/x11_sockets.rs
index f872b61..fd7d7d7 100644
--- a/src/xwayland/x11_sockets.rs
+++ b/src/xwayland/x11_sockets.rs
@@ -19,7 +19,7 @@ pub(crate) fn prepare_x11_sockets(log: ::slog::Logger) -> Result<(X11Lock, [Unix
     }
     // If we reach here, all values from 0 to 32 failed
     // we need to stop trying at some point
-    return Err(());
+    Err(())
 }
 
 pub(crate) struct X11Lock {
@@ -44,11 +44,11 @@ impl X11Lock {
                     // write to the file failed ? we abandon
                     ::std::mem::drop(file);
                     let _ = ::std::fs::remove_file(&filename);
-                    return Err(());
+                    Err(())
                 } else {
                     debug!(log, "X11 lock aquired"; "D" => display);
                     // we got the lockfile and wrote our pid to it, all is good
-                    return Ok(X11Lock { display, log });
+                    Ok(X11Lock { display, log })
                 }
             }
             Err(_) => {
@@ -79,7 +79,7 @@ impl X11Lock {
                     }
                 }
                 // if we reach here, this lockfile exists and is probably in use, give up
-                return Err(());
+                Err(())
             }
         }
     }