rustfmt the NetBSD implementation

Author: jcjones

src/netbsd/device.rs

@@ -4,10 +4,10 @@
 
 extern crate libc;
 
-use std::mem;
+use std::io;
 use std::io::Read;
 use std::io::Write;
-use std::io;
+use std::mem;
 
 use consts::CID_BROADCAST;
 use consts::HID_RPT_SIZE;
@@ -24,7 +24,10 @@ pub struct Device {
 
 impl Device {
     pub fn new(fd: Fd) -> io::Result<Self> {
-        Ok(Self { fd, cid: CID_BROADCAST })
+        Ok(Self {
+            fd,
+            cid: CID_BROADCAST,
+        })
     }
 
     pub fn is_u2f(&mut self) -> bool {
@@ -52,14 +55,14 @@ impl Device {
         for i in 0..10 {
             let mut buf = vec![0u8; 1 + HID_RPT_SIZE];
 
-            buf[0] = 0;         // report number
-            buf[1] = 0xff;      // CID_BROADCAST
+            buf[0] = 0; // report number
+            buf[1] = 0xff; // CID_BROADCAST
             buf[2] = 0xff;
             buf[3] = 0xff;
             buf[4] = 0xff;
-            buf[5] = 0x81;      // ping
+            buf[5] = 0x81; // ping
             buf[6] = 0;
-            buf[7] = 1;         // one byte
+            buf[7] = 1; // one byte
 
             self.write(&buf[..])?;
 
@@ -108,9 +111,7 @@ impl Write for Device {
         // Always skip the first byte (report number)
         let data = &buf[1..];
         let data_ptr = data.as_ptr() as *const libc::c_void;
-        let nwrit = unsafe {
-            libc::write(self.fd.fileno, data_ptr, data.len())
-        };
+        let nwrit = unsafe { libc::write(self.fd.fileno, data_ptr, data.len()) };
         if nwrit == -1 {
             return Err(io::Error::last_os_error());
         }

src/netbsd/monitor.rs

@@ -44,13 +44,11 @@ where
                 match Fd::open(&uhidpath, libc::O_RDWR | libc::O_CLOEXEC) {
                     Ok(uhid) => {
                         self.add_device(uhid, OsString::from(&uhidpath));
-                    },
-                    Err(ref err) => {
-                        match err.raw_os_error() {
-                            Some(libc::EBUSY) => continue,
-                            Some(libc::ENOENT) => break,
-                            _ => self.remove_device(OsString::from(&uhidpath)),
-                        }
+                    }
+                    Err(ref err) => match err.raw_os_error() {
+                        Some(libc::EBUSY) => continue,
+                        Some(libc::ENOENT) => break,
+                        _ => self.remove_device(OsString::from(&uhidpath)),
                     },
                 }
             }

src/netbsd/uhid.rs

@@ -9,8 +9,8 @@ use std::mem;
 use std::os::raw::c_int;
 use std::os::raw::c_uchar;
 
-use hidproto::ReportDescriptor;
 use hidproto::has_fido_usage;
+use hidproto::ReportDescriptor;
 use platform::fd::Fd;
 use util::io_err;
 
@@ -27,11 +27,9 @@ const IOC_IN: u32 = 0x80000000;
 
 macro_rules! ioctl {
     ($dir:expr, $name:ident, $group:expr, $nr:expr, $ty:ty) => {
-        unsafe fn $name(fd: libc::c_int, val: *mut $ty)
-                -> io::Result<libc::c_int> {
+        unsafe fn $name(fd: libc::c_int, val: *mut $ty) -> io::Result<libc::c_int> {
             let ioc = ($dir as u32)
-                | ((mem::size_of::<$ty>() as u32 & IOCPARM_MASK)
-                   << IOCPARM_SHIFT)
+                | ((mem::size_of::<$ty>() as u32 & IOCPARM_MASK) << IOCPARM_SHIFT)
                 | (($group as u32) << IOCGROUP_SHIFT)
                 | ($nr as u32);
             let rv = libc::ioctl(fd, ioc as libc::c_ulong, val);