From c2efbb6fd178d8b925832b74498cc115e340d9cd Mon Sep 17 00:00:00 2001
From: moparisthebest <admin@moparisthebest.com>
Date: Sun, 29 Sep 2019 23:58:51 -0400
Subject: [PATCH] More edition 2018 cleanup

---
 src/device/builder.rs      |  2 +-
 src/device/device.rs       |  2 +-
 src/device/input_device.rs |  1 +
 src/keymapper.rs           |  5 ++---
 src/lib.rs                 | 12 +-----------
 src/main.rs                |  8 +-------
 6 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/device/builder.rs b/src/device/builder.rs
index 46907b3..79a2e5c 100644
--- a/src/device/builder.rs
+++ b/src/device/builder.rs
@@ -4,7 +4,7 @@ use std::ffi::CString;
 use libc::c_int;
 use nix::{self, fcntl, unistd, errno::Errno};
 use nix::sys::stat;
-use ffi::*;
+use uinput_sys::*;
 use crate::{Result as Res, Device};
 use std::collections::hash_map::Values;
 
diff --git a/src/device/device.rs b/src/device/device.rs
index 52ebc62..324bdf3 100644
--- a/src/device/device.rs
+++ b/src/device/device.rs
@@ -1,7 +1,7 @@
 use std::{mem, ptr, slice};
 use libc::{timeval, gettimeofday, input_event, c_int};
 use nix::{unistd, errno::Errno};
-use ffi::*;
+use uinput_sys::*;
 use crate::{Result as Res};
 
 /// The virtual device.
diff --git a/src/device/input_device.rs b/src/device/input_device.rs
index d0a754e..2a9da59 100644
--- a/src/device/input_device.rs
+++ b/src/device/input_device.rs
@@ -3,6 +3,7 @@ use std::fs::File;
 use std::io::Read;
 use std::os::unix::io::AsRawFd;
 use libc::{input_event, c_int};
+use nix::ioctl_write_ptr;
 use crate::{Error,Result};
 
 ioctl_write_ptr!(eviocgrab, b'E', 0x90, c_int);
diff --git a/src/keymapper.rs b/src/keymapper.rs
index 2db64e1..406f942 100644
--- a/src/keymapper.rs
+++ b/src/keymapper.rs
@@ -1,7 +1,7 @@
 
 use crate::Device;
 
-use ffi::*;
+use uinput_sys::*;
 use libc::{c_int, input_event};
 
 use std::fs::File;
@@ -399,9 +399,8 @@ impl KeyMapper for Key {
     }
 }
 
-extern crate toml;
-
 use std::path::Path;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize, Debug)]
 pub struct KeymapConfig {
diff --git a/src/lib.rs b/src/lib.rs
index 432873d..d7b06ec 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,18 +1,8 @@
 #![recursion_limit = "1000"]
 
-extern crate libc;
-
-extern crate uinput_sys as ffi;
-
-#[macro_use]
-extern crate nix;
-
-#[macro_use]
-extern crate serde_derive;
-
 use std::path::Path;
 
-mod error;
+pub mod error;
 pub use error::Error;
 
 pub type Result<T> = ::std::result::Result<T, Error>;
diff --git a/src/main.rs b/src/main.rs
index 691c2c4..4af1ef6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,12 +1,6 @@
-extern crate rusty_keys;
-extern crate uinput_sys as ffi;
-extern crate libc;
-extern crate getopts;
-extern crate inotify;
-
 use rusty_keys::{KeyMaps, Device, InputDevice, Result};
 
-use ffi::*;
+use uinput_sys::*;
 use libc::input_event;
 use std::process::exit;
 use std::{env, thread};