update evdev-rs to 0.6.1

Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Wez Furlong"]
 edition = "2018"
 
 [dependencies]
-evdev-rs = "0.3"
+evdev-rs = "0.6.1"
 anyhow = "1.0"
 log = "0.4"
 pretty_env_logger = "0.3"

src/deviceinfo.rs

@@ -1,5 +1,5 @@
-use anyhow::{anyhow, bail, Context, Result};
-use evdev_rs::Device;
+use anyhow::{bail, Context, Result};
+use evdev_rs::{Device, DeviceWrapper};
 use std::cmp::Ordering;
 use std::path::PathBuf;
 
@@ -13,10 +13,8 @@ pub struct DeviceInfo {
 impl DeviceInfo {
     pub fn with_path(path: PathBuf) -> Result<Self> {
         let f = std::fs::File::open(&path).context(format!("opening {}", path.display()))?;
-        let mut input = Device::new().ok_or_else(|| anyhow!("failed to make new Device"))?;
-        input
-            .set_fd(f)
-            .context(format!("assigning fd for {} to Device", path.display()))?;
+        let input = Device::new_from_file(f)
+            .with_context(|| format!("failed to create new Device from file {}", path.display()))?;
 
         Ok(Self {
             name: input.name().unwrap_or("").to_string(),

src/remapper.rs

@@ -1,6 +1,6 @@
 use crate::mapping::*;
 use anyhow::*;
-use evdev_rs::{Device, GrabMode, InputEvent, ReadFlag, TimeVal, UInputDevice};
+use evdev_rs::{DeviceWrapper, Device, GrabMode, InputEvent, ReadFlag, TimeVal, UInputDevice};
 use std::cmp::Ordering;
 use std::collections::{HashMap, HashSet};
 use std::path::Path;
@@ -65,7 +65,7 @@ pub struct InputMapper {
 
 fn enable_key_code(input: &mut Device, key: KeyCode) -> Result<()> {
     input
-        .enable(&EventCode::EV_KEY(key.clone()))
+        .enable(EventCode::EV_KEY(key.clone()))
         .context(format!("enable key {:?}", key))?;
     Ok(())
 }
@@ -74,10 +74,8 @@ impl InputMapper {
     pub fn create_mapper<P: AsRef<Path>>(path: P, mappings: Vec<Mapping>) -> Result<Self> {
         let path = path.as_ref();
         let f = std::fs::File::open(path).context(format!("opening {}", path.display()))?;
-        let mut input = Device::new().ok_or_else(|| anyhow!("failed to make new Device"))?;
-        input
-            .set_fd(f)
-            .context(format!("assigning fd for {} to Device", path.display()))?;
+        let mut input = Device::new_from_file(f)
+            .with_context(|| format!("failed to create new Device from file {}", path.display()))?;
 
         input.set_name(&format!("evremap Virtual input for {}", path.display()));