Switch to std::io::{Error,Result}

The error struct defined by the udev crate doesn't really seem to add any value over simply using std::io::Error directly and doesn't give great error messages either. Switch over to simply using std::io:Error directly as well as changing the try_alloc! over to get the value of errno rather then always returning ENOMEM on failure. When debugging the failure of creating monitoring sockets this changed the error reporting from: Error: Custom { kind: Other, error: "Unknown error -12" } to: Error: Os { code: 22, kind: InvalidInput, message: "Invalid argument" } Which is a lot more meaningful. Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
carlosmn · Jan 23, 2020 · 484ad6a · 484ad6a
1 parent 92374a7
commit 484ad6a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 89 deletions.
diff --git a/src/device.rs b/src/device.rs
@@ -1,6 +1,7 @@
 use std::str;
 
 use std::ffi::{CStr, OsStr};
+use std::io::Result;
 use std::path::Path;
 use std::ptr;
 use std::str::FromStr;
@@ -9,7 +10,7 @@ use libc::{c_char, dev_t};
 
 use {ffi, util};
 
-use {FromRaw, Result};
+use FromRaw;
 
 /// A structure that provides access to sysfs/kernel devices.
 pub struct Device {

diff --git a/src/enumerator.rs b/src/enumerator.rs
@@ -1,10 +1,11 @@
 use std::ffi::OsStr;
+use std::io::Result;
 use std::path::Path;
 use std::ptr;
 
 use {ffi, util};
 
-use {AsRaw, Device, FromRaw, Result};
+use {AsRaw, Device, FromRaw};
 
 /// An enumeration context.
 ///

diff --git a/src/error.rs b/src/error.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -9,15 +9,14 @@ extern crate libudev_sys as ffi;
 
 pub use device::{Attribute, Attributes, Device, Properties, Property};
 pub use enumerator::{Devices, Enumerator};
-pub use error::{Error, Kind as ErrorKind, Result};
 pub use monitor::{Builder as MonitorBuilder, Event, EventType, Socket as MonitorSocket};
 
 macro_rules! try_alloc {
     ($exp:expr) => {{
         let ptr = $exp;
 
         if ptr.is_null() {
-            return Err(::error::from_errno(::libc::ENOMEM));
+            return Err(std::io::Error::last_os_error());
         }
 
         ptr
@@ -72,6 +71,5 @@ macro_rules! as_ffi {
 
 mod device;
 mod enumerator;
-mod error;
 mod monitor;
 mod util;
diff --git a/src/monitor.rs b/src/monitor.rs
@@ -2,12 +2,13 @@ use std::fmt;
 use std::ptr;
 
 use std::ffi::OsStr;
+use std::io::Result;
 use std::ops::Deref;
 use std::os::unix::io::{AsRawFd, RawFd};
 
 use {ffi, util};
 
-use {AsRaw, Device, FromRaw, Result};
+use {AsRaw, Device, FromRaw};
 
 /// Monitors for device events.
 ///

diff --git a/src/util.rs b/src/util.rs
@@ -1,14 +1,11 @@
 use std::ffi::{CString, OsStr};
+use std::io::Result;
 use std::slice;
 
 use libc::{c_char, c_int};
 
 use std::os::unix::prelude::*;
 
-use error;
-
-use Result;
-
 pub fn ptr_to_os_str<'a>(ptr: *const c_char) -> Option<&'a OsStr> {
     if ptr.is_null() {
         return None;
@@ -27,13 +24,13 @@ pub unsafe fn ptr_to_os_str_unchecked<'a>(ptr: *const c_char) -> &'a OsStr {
 pub fn os_str_to_cstring<T: AsRef<OsStr>>(s: T) -> Result<CString> {
     match CString::new(s.as_ref().as_bytes()) {
         Ok(s) => Ok(s),
-        Err(_) => Err(error::from_errno(libc::EINVAL)),
+        Err(_) => Err(std::io::Error::from_raw_os_error(libc::EINVAL)),
     }
 }
 
 pub fn errno_to_result(errno: c_int) -> Result<()> {
     match errno {
         0 => Ok(()),
-        e => Err(error::from_errno(e)),
+        e => Err(std::io::Error::from_raw_os_error(e)),
     }
 }