Converted AddressFamily to struct with associated consts

Author: Jan561

src/ifaddrs.rs

@@ -200,11 +200,10 @@ mod tests {
             } else {
                 continue;
             };
-            if sock.family() == Some(crate::sys::socket::AddressFamily::Inet) {
+            if sock.family() == crate::sys::socket::AddressFamily::INET {
                 let _ = sock.as_sockaddr_in().unwrap();
                 return;
-            } else if sock.family()
-                == Some(crate::sys::socket::AddressFamily::Inet6)
+            } else if sock.family() == crate::sys::socket::AddressFamily::INET6
             {
                 let _ = sock.as_sockaddr_in6().unwrap();
                 return;

src/sys/epoll.rs

@@ -1,6 +1,6 @@
 use crate::errno::Errno;
-use crate::Result;
 pub use crate::poll_timeout::PollTimeout as EpollTimeout;
+use crate::Result;
 use libc::{self, c_int};
 use std::mem;
 use std::os::unix::io::{AsFd, AsRawFd, FromRawFd, OwnedFd, RawFd};

src/sys/fanotify.rs

@@ -10,12 +10,12 @@
 //! For more documentation, please read
 //! [fanotify(7)](https://man7.org/linux/man-pages/man7/fanotify.7.html).
 
-use crate::{NixPath, Result};
 use crate::errno::Errno;
-use crate::fcntl::{OFlag, at_rawfd};
+use crate::fcntl::{at_rawfd, OFlag};
 use crate::unistd::{close, read, write};
+use crate::{NixPath, Result};
 use std::marker::PhantomData;
-use std::mem::{MaybeUninit, size_of};
+use std::mem::{size_of, MaybeUninit};
 use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, OwnedFd, RawFd};
 use std::ptr;
 
@@ -288,11 +288,16 @@ impl Fanotify {
     /// Returns a Result containing a Fanotify instance.
     ///
     /// For more information, see [fanotify_init(2)](https://man7.org/linux/man-pages/man7/fanotify_init.2.html).
-    pub fn init(flags: InitFlags, event_f_flags: EventFFlags) -> Result<Fanotify> {
+    pub fn init(
+        flags: InitFlags,
+        event_f_flags: EventFFlags,
+    ) -> Result<Fanotify> {
         let res = Errno::result(unsafe {
             libc::fanotify_init(flags.bits(), event_f_flags.bits())
         });
-        res.map(|fd| Fanotify { fd: unsafe { OwnedFd::from_raw_fd(fd) }})
+        res.map(|fd| Fanotify {
+            fd: unsafe { OwnedFd::from_raw_fd(fd) },
+        })
     }
 
     /// Add, remove, or modify an fanotify mark on a filesystem object.
@@ -386,22 +391,21 @@ impl Fanotify {
     /// available on a group that has been initialized with the flag
     /// `InitFlags::FAN_NONBLOCK`, thus making this method nonblocking.
     pub fn write_response(&self, response: FanotifyResponse) -> Result<()> {
-        write(
-            self.fd.as_fd(),
-            unsafe {
-                std::slice::from_raw_parts(
-                    (&response.inner as *const libc::fanotify_response).cast(),
-                    size_of::<libc::fanotify_response>(),
-                )
-            },
-        )?;
+        write(self.fd.as_fd(), unsafe {
+            std::slice::from_raw_parts(
+                (&response.inner as *const libc::fanotify_response).cast(),
+                size_of::<libc::fanotify_response>(),
+            )
+        })?;
         Ok(())
     }
 }
 
 impl FromRawFd for Fanotify {
     unsafe fn from_raw_fd(fd: RawFd) -> Self {
-        Fanotify { fd: unsafe { OwnedFd::from_raw_fd(fd) }}
+        Fanotify {
+            fd: unsafe { OwnedFd::from_raw_fd(fd) },
+        }
     }
 }
 

src/sys/ptrace/bsd.rs

@@ -68,7 +68,7 @@ unsafe fn ptrace_other(
             addr,
             data,
         ))
-            .map(|_| 0)
+        .map(|_| 0)
     }
 }
 

src/sys/sendfile.rs

@@ -22,7 +22,12 @@ use crate::Result;
 ///
 /// For more information, see [the sendfile(2) man page.](https://man7.org/linux/man-pages/man2/sendfile.2.html) for Linux,
 /// see [the sendfile(2) man page.](https://docs.oracle.com/cd/E88353_01/html/E37843/sendfile-3c.html) for Solaris.
-#[cfg(any(target_os = "android", target_os = "linux", target_os = "solaris", target_os = "illumos"))]
+#[cfg(any(
+    target_os = "android",
+    target_os = "linux",
+    target_os = "solaris",
+    target_os = "illumos"
+))]
 pub fn sendfile<F1: AsFd, F2: AsFd>(
     out_fd: F1,
     in_fd: F2,