Migrate to 2018 edition. (#924)

* Migrate to 2018 edition.

* Use impl Iterator at one site.

* Fix more rust 2018 idioms.

src/platform_impl/linux/x11/util/client_msg.rs

@@ -8,7 +8,7 @@ impl XConnection {
         target_window: c_ulong,
         event_mask: Option<c_long>,
         event: T,
-    ) -> Flusher {
+    ) -> Flusher<'_> {
         let event_mask = event_mask.unwrap_or(ffi::NoEventMask);
         unsafe {
             (self.xlib.XSendEvent)(
@@ -29,7 +29,7 @@ impl XConnection {
         message_type: ffi::Atom,
         event_mask: Option<c_long>,
         data: ClientMsgPayload,
-    ) -> Flusher {
+    ) -> Flusher<'_> {
         let mut event: ffi::XClientMessageEvent = unsafe { mem::uninitialized() };
         event.type_ = ffi::ClientMessage;
         event.display = self.display;
@@ -50,7 +50,7 @@ impl XConnection {
         message_type: ffi::Atom,
         event_mask: Option<c_long>,
         data: &[T],
-    ) -> Flusher {
+    ) -> Flusher<'_> {
         let format = T::FORMAT;
         let size_of_t = mem::size_of::<T>();
         debug_assert_eq!(size_of_t, format.get_actual_size());

src/platform_impl/linux/x11/util/geometry.rs

@@ -1,7 +1,7 @@
 use std::cmp;
 
 use super::*;
-use dpi::{LogicalPosition, LogicalSize};
+use crate::dpi::{LogicalPosition, LogicalSize};
 
 // Friendly neighborhood axis-aligned rectangle
 #[derive(Debug, Clone, PartialEq, Eq)]

src/platform_impl/linux/x11/util/hint.rs

@@ -187,7 +187,7 @@ impl<'a> NormalHints<'a> {
 }
 
 impl XConnection {
-    pub fn get_wm_hints(&self, window: ffi::Window) -> Result<XSmartPointer<ffi::XWMHints>, XError> {
+    pub fn get_wm_hints(&self, window: ffi::Window) -> Result<XSmartPointer<'_, ffi::XWMHints>, XError> {
         let wm_hints = unsafe { (self.xlib.XGetWMHints)(self.display, window) };
         self.check_errors()?;
         let wm_hints = if wm_hints.is_null() {
@@ -198,7 +198,7 @@ impl XConnection {
         Ok(wm_hints)
     }
 
-    pub fn set_wm_hints(&self, window: ffi::Window, wm_hints: XSmartPointer<ffi::XWMHints>) -> Flusher {
+    pub fn set_wm_hints(&self, window: ffi::Window, wm_hints: XSmartPointer<'_, ffi::XWMHints>) -> Flusher<'_> {
         unsafe {
             (self.xlib.XSetWMHints)(
                 self.display,
@@ -209,7 +209,7 @@ impl XConnection {
         Flusher::new(self)
     }
 
-    pub fn get_normal_hints(&self, window: ffi::Window) -> Result<NormalHints, XError> {
+    pub fn get_normal_hints(&self, window: ffi::Window) -> Result<NormalHints<'_>, XError> {
         let size_hints = self.alloc_size_hints();
         let mut supplied_by_user: c_long = unsafe { mem::uninitialized() };
         unsafe {
@@ -223,7 +223,7 @@ impl XConnection {
         self.check_errors().map(|_| NormalHints { size_hints })
     }
 
-    pub fn set_normal_hints(&self, window: ffi::Window, normal_hints: NormalHints) -> Flusher {
+    pub fn set_normal_hints(&self, window: ffi::Window, normal_hints: NormalHints<'_>) -> Flusher<'_> {
         unsafe {
             (self.xlib.XSetWMNormalHints)(
                 self.display,

src/platform_impl/linux/x11/util/icon.rs

@@ -1,4 +1,4 @@
-use window::{Icon, Pixel, PIXEL_SIZE};
+use crate::window::{Icon, Pixel, PIXEL_SIZE};
 use super::*;
 
 impl Pixel {

src/platform_impl/linux/x11/util/input.rs

@@ -1,7 +1,7 @@
 use std::str;
 
 use super::*;
-use event::ModifiersState;
+use crate::event::ModifiersState;
 
 pub const VIRTUAL_CORE_POINTER: c_int = 2;
 pub const VIRTUAL_CORE_KEYBOARD: c_int = 3;
@@ -55,7 +55,7 @@ impl<'a> Drop for PointerState<'a> {
 }
 
 impl XConnection {
-    pub fn select_xinput_events(&self, window: c_ulong, device_id: c_int, mask: i32) -> Flusher {
+    pub fn select_xinput_events(&self, window: c_ulong, device_id: c_int, mask: i32) -> Flusher<'_> {
         let mut event_mask = ffi::XIEventMask {
             deviceid: device_id,
             mask: &mask as *const _ as *mut c_uchar,
@@ -73,7 +73,7 @@ impl XConnection {
     }
 
     #[allow(dead_code)]
-    pub fn select_xkb_events(&self, device_id: c_uint, mask: c_ulong) -> Option<Flusher> {
+    pub fn select_xkb_events(&self, device_id: c_uint, mask: c_ulong) -> Option<Flusher<'_>> {
         let status = unsafe {
             (self.xlib.XkbSelectEvents)(
                 self.display,
@@ -89,9 +89,9 @@ impl XConnection {
         }
     }
 
-    pub fn query_pointer(&self, window: ffi::Window, device_id: c_int) -> Result<PointerState, XError> {
+    pub fn query_pointer(&self, window: ffi::Window, device_id: c_int) -> Result<PointerState<'_>, XError> {
         unsafe {
-            let mut pointer_state: PointerState = mem::uninitialized();
+            let mut pointer_state: PointerState<'_> = mem::uninitialized();
             pointer_state.xconn = self;
             pointer_state.relative_to_window = (self.xinput2.XIQueryPointer)(
                 self.display,

src/platform_impl/linux/x11/util/memory.rs

@@ -45,17 +45,17 @@ impl<'a, T> Drop for XSmartPointer<'a, T> {
 }
 
 impl XConnection {
-    pub fn alloc_class_hint(&self) -> XSmartPointer<ffi::XClassHint> {
+    pub fn alloc_class_hint(&self) -> XSmartPointer<'_, ffi::XClassHint> {
         XSmartPointer::new(self, unsafe { (self.xlib.XAllocClassHint)() })
             .expect("`XAllocClassHint` returned null; out of memory")
     }
 
-    pub fn alloc_size_hints(&self) -> XSmartPointer<ffi::XSizeHints> {
+    pub fn alloc_size_hints(&self) -> XSmartPointer<'_, ffi::XSizeHints> {
         XSmartPointer::new(self, unsafe { (self.xlib.XAllocSizeHints)() })
             .expect("`XAllocSizeHints` returned null; out of memory")
     }
 
-    pub fn alloc_wm_hints(&self) -> XSmartPointer<ffi::XWMHints> {
+    pub fn alloc_wm_hints(&self) -> XSmartPointer<'_, ffi::XWMHints> {
         XSmartPointer::new(self, unsafe { (self.xlib.XAllocWMHints)() })
             .expect("`XAllocWMHints` returned null; out of memory")
     }

src/platform_impl/linux/x11/util/randr.rs

@@ -1,8 +1,8 @@
 use std::{env, slice};
 use std::str::FromStr;
 
-use monitor::VideoMode;
-use dpi::validate_hidpi_factor;
+use crate::monitor::VideoMode;
+use crate::dpi::validate_hidpi_factor;
 use super::*;
 
 pub fn calc_dpi_factor(