diff --git a/Cargo.toml b/Cargo.toml index 2fae291..0994f7e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "evdev" -version = "0.11.6" +version = "0.11.7" authors = ["Corey Richardson "] description = "evdev interface for Linux" license = "Apache-2.0 OR MIT" diff --git a/examples/_pick_device.rs b/examples/_pick_device.rs index a10f83d..fe3cbb2 100644 --- a/examples/_pick_device.rs +++ b/examples/_pick_device.rs @@ -10,7 +10,7 @@ pub fn pick_device() -> evdev::Device { if let Some(dev_file) = args.next() { evdev::Device::open(dev_file).unwrap() } else { - let mut devices = evdev::enumerate().map(|t| t.1).collect::>(); + let mut devices = evdev::enumerate().collect::>(); // readdir returns them in reverse order from their eventN names for some reason devices.reverse(); for (i, d) in devices.iter().enumerate() { diff --git a/src/lib.rs b/src/lib.rs index aa7f0ed..eb57ab2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -108,7 +108,6 @@ use serde_1::{Deserialize, Serialize}; use crate::compat::{input_absinfo, input_event, uinput_abs_setup}; use std::fmt; -use std::path::PathBuf; use std::time::{Duration, SystemTime}; pub use attribute_set::{AttributeSet, AttributeSetRef, EvdevEnum}; @@ -368,11 +367,9 @@ pub struct EnumerateDevices { inner: raw_stream::EnumerateDevices, } impl Iterator for EnumerateDevices { - type Item = (PathBuf, Device); - fn next(&mut self) -> Option<(PathBuf, Device)> { - self.inner - .next() - .map(|(pb, dev)| (pb, Device::from_raw_device(dev))) + type Item = Device; + fn next(&mut self) -> Option { + self.inner.next().map(Device::from_raw_device) } } diff --git a/src/raw_stream.rs b/src/raw_stream.rs index e917da1..937ed32 100644 --- a/src/raw_stream.rs +++ b/src/raw_stream.rs @@ -2,7 +2,7 @@ use std::fs::{File, OpenOptions}; use std::io::Write; use std::mem::MaybeUninit; use std::os::unix::io::{AsRawFd, RawFd}; -use std::path::{Path, PathBuf}; +use std::path::Path; use std::{io, mem}; use crate::compat::{input_absinfo, input_event, input_id, input_keymap_entry}; @@ -766,8 +766,8 @@ pub struct EnumerateDevices { readdir: Option, } impl Iterator for EnumerateDevices { - type Item = (PathBuf, RawDevice); - fn next(&mut self) -> Option<(PathBuf, RawDevice)> { + type Item = RawDevice; + fn next(&mut self) -> Option { use std::os::unix::ffi::OsStrExt; let readdir = self.readdir.as_mut()?; loop { @@ -776,7 +776,7 @@ impl Iterator for EnumerateDevices { let fname = path.file_name().unwrap(); if fname.as_bytes().starts_with(b"event") { if let Ok(dev) = RawDevice::open(&path) { - return Some((path, dev)); + return Some(dev); } } }