Updating clippy warnings. (Narsil#62)

* Updating clippy warnings.

* Remove dead import

Author: Narsil

src/linux/common.rs

@@ -99,6 +99,7 @@ impl Display {
         }
     }
 
+    #[cfg(feature = "unstable_grab")]
     pub fn get_mouse_pos(&self) -> Option<(u64, u64)> {
         unsafe {
             let root_window = xlib::XRootWindow(self.display, 0);

src/linux/grab.rs

@@ -302,14 +302,12 @@ fn evdev_event_to_rdev_event(
 // }
 
 pub fn grab(callback: GrabCallback) -> Result<(), GrabError> {
-    let mut kb = Keyboard::new().ok_or_else(|| GrabError::KeyboardError)?;
-    let display = Display::new().ok_or_else(|| GrabError::MissingDisplayError)?;
-    let (width, height) = display
-        .get_size()
-        .ok_or_else(|| GrabError::MissingDisplayError)?;
+    let mut kb = Keyboard::new().ok_or(GrabError::KeyboardError)?;
+    let display = Display::new().ok_or(GrabError::MissingDisplayError)?;
+    let (width, height) = display.get_size().ok_or(GrabError::MissingDisplayError)?;
     let (current_x, current_y) = display
         .get_mouse_pos()
-        .ok_or_else(|| GrabError::MissingDisplayError)?;
+        .ok_or(GrabError::MissingDisplayError)?;
     let mut x = current_x as f64;
     let mut y = current_y as f64;
     let w = width as f64;
@@ -346,8 +344,7 @@ where
     //grab devices
     let _grab = devices
         .iter_mut()
-        .map(|device| device.grab(evdev_rs::GrabMode::Grab))
-        .collect::<io::Result<()>>()?;
+        .try_for_each(|device| device.grab(evdev_rs::GrabMode::Grab))?;
 
     // create buffer for epoll to fill
     let mut epoll_buffer = [epoll::Event::new(epoll::Events::empty(), 0); 4];

src/linux/keyboard.rs

@@ -2,7 +2,7 @@ extern crate x11;
 use crate::linux::keycodes::code_from_key;
 use crate::rdev::{EventType, Key, KeyboardState};
 use std::ffi::CString;
-use std::os::raw::{c_char, c_int, c_uchar, c_uint, c_ulong, c_void};
+use std::os::raw::{c_char, c_int, c_uint, c_ulong, c_void};
 use std::ptr::{null, null_mut, NonNull};
 use x11::xlib;
 
@@ -156,7 +156,7 @@ impl Keyboard {
             return None;
         }
         const BUF_LEN: usize = 4;
-        let mut buf = [0 as c_uchar; BUF_LEN];
+        let mut buf = [0_u8; BUF_LEN];
         let key = xlib::XKeyEvent {
             display: *self.display,
             root: 0,

src/linux/listen.rs

@@ -5,7 +5,7 @@ use crate::linux::keyboard::Keyboard;
 use crate::rdev::{Callback, Event, ListenError};
 use std::convert::TryInto;
 use std::ffi::CStr;
-use std::os::raw::{c_char, c_int, c_uchar, c_uint};
+use std::os::raw::{c_char, c_int, c_uchar, c_uint, c_ulong};
 use std::ptr::null;
 use x11::xlib;
 use x11::xrecord;
@@ -14,10 +14,11 @@ fn default_callback(event: Event) {
     println!("Default : Event {:?}", event);
 }
 
+static mut RECORD_ALL_CLIENTS: c_ulong = xrecord::XRecordAllClients;
 static mut GLOBAL_CALLBACK: Callback = default_callback;
 
 pub fn listen(callback: Callback) -> Result<(), ListenError> {
-    let keyboard = Keyboard::new().ok_or_else(|| ListenError::KeyboardError)?;
+    let keyboard = Keyboard::new().ok_or(ListenError::KeyboardError)?;
 
     unsafe {
         KEYBOARD = Some(keyboard);
@@ -43,7 +44,7 @@ pub fn listen(callback: Callback) -> Result<(), ListenError> {
         let context = xrecord::XRecordCreateContext(
             dpy_control,
             0,
-            &mut xrecord::XRecordAllClients,
+            &mut RECORD_ALL_CLIENTS,
             1,
             &mut &mut record_range as *mut &mut xrecord::XRecordRange
                 as *mut *mut xrecord::XRecordRange,

src/macos/keyboard.rs

@@ -93,7 +93,7 @@ impl Keyboard {
         let layout = TISGetInputSourceProperty(keyboard, kTISPropertyUnicodeKeyLayoutData);
         let layout_ptr = CFDataGetBytePtr(layout);
 
-        let mut buff = [0 as UniChar; BUF_LEN];
+        let mut buff = [0_u16; BUF_LEN];
         let kb_type = LMGetKbdType();
         let mut length = 0;
         let _retval = UCKeyTranslate(

src/windows/keyboard.rs

@@ -3,7 +3,6 @@ use crate::windows::common::{get_code, get_scan_code, FALSE, TRUE};
 use crate::windows::keycodes::code_from_key;
 use std::ptr::null_mut;
 use winapi::shared::minwindef::{BYTE, HKL, LPARAM, UINT};
-use winapi::shared::ntdef::WCHAR;
 use winapi::um::processthreadsapi::GetCurrentThreadId;
 use winapi::um::winuser;
 use winapi::um::winuser::{
@@ -45,7 +44,7 @@ impl Keyboard {
     }
 
     pub(crate) unsafe fn set_global_state(&mut self) -> Option<()> {
-        let mut state = [0 as BYTE; 256];
+        let mut state = [0_u8; 256];
         let state_ptr = state.as_mut_ptr();
 
         let _shift = GetKeyState(VK_SHIFT);
@@ -75,7 +74,7 @@ impl Keyboard {
         let current_window_thread_id = GetWindowThreadProcessId(GetForegroundWindow(), null_mut());
         let state_ptr = self.last_state.as_mut_ptr();
         const BUF_LEN: i32 = 32;
-        let mut buff = [0 as WCHAR; BUF_LEN as usize];
+        let mut buff = [0_u16; BUF_LEN as usize];
         let buff_ptr = buff.as_mut_ptr();
         let layout = GetKeyboardLayout(current_window_thread_id);
         let len = ToUnicodeEx(code, scan_code, state_ptr, buff_ptr, 8 - 1, 0, layout);
@@ -116,9 +115,9 @@ impl Keyboard {
 
     unsafe fn clear_keyboard_buffer(&self, code: UINT, scan_code: UINT, layout: HKL) {
         const BUF_LEN: i32 = 32;
-        let mut buff = [0 as WCHAR; BUF_LEN as usize];
+        let mut buff = [0_u16; BUF_LEN as usize];
         let buff_ptr = buff.as_mut_ptr();
-        let mut state = [0 as BYTE; 256];
+        let mut state = [0_u8; 256];
         let state_ptr = state.as_mut_ptr();
 
         let mut len = -1;