Merge pull request #1398 from dtolnay-contrib/rustfmt

Make all source files visible to rustfmt

src/lib.rs

@@ -116,6 +116,16 @@ mod debug;
 mod serde;
 pub(crate) mod utils;
 
+// Make formattable by rustfmt.
+#[cfg(any())]
+mod network;
+#[cfg(any())]
+mod unix;
+#[cfg(any())]
+mod unknown;
+#[cfg(any())]
+mod windows;
+
 /// This function is only used on Linux targets, when the `system` feature is enabled. In other
 /// cases, it does nothing and returns `false`.
 ///

src/unix/apple/macos/component/arm.rs

@@ -111,7 +111,8 @@ impl ComponentsInner {
                     None => continue,
                 };
 
-                let name_ptr = CFStringGetCStringPtr(name.inner() as *const _, kCFStringEncodingUTF8);
+                let name_ptr =
+                    CFStringGetCStringPtr(name.inner() as *const _, kCFStringEncodingUTF8);
                 if name_ptr.is_null() {
                     continue;
                 }
@@ -135,8 +136,8 @@ pub(crate) struct ComponentInner {
     critical: Option<f32>,
 }
 
-unsafe impl Send for ComponentInner{}
-unsafe impl Sync for ComponentInner{}
+unsafe impl Send for ComponentInner {}
+unsafe impl Sync for ComponentInner {}
 
 impl ComponentInner {
     pub(crate) fn new(

src/unix/apple/macos/ffi.rs

@@ -1,19 +1,25 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-#[cfg(any(feature = "system", feature = "disk"))]
-use core_foundation_sys::base::CFAllocatorRef;
 #[cfg(any(
     feature = "system",
     feature = "disk",
-    all(feature = "component", any(target_arch = "x86", target_arch = "x86_64")),
+    all(
+        feature = "component",
+        any(target_arch = "x86", target_arch = "x86_64")
+    ),
 ))]
 use core_foundation_sys::base::mach_port_t;
 #[cfg(any(feature = "system", feature = "disk"))]
+use core_foundation_sys::base::CFAllocatorRef;
+#[cfg(any(feature = "system", feature = "disk"))]
 use core_foundation_sys::dictionary::CFDictionaryRef;
 #[cfg(any(
     feature = "system",
     feature = "disk",
-    all(feature = "component", any(target_arch = "x86", target_arch = "x86_64")),
+    all(
+        feature = "component",
+        any(target_arch = "x86", target_arch = "x86_64")
+    ),
 ))]
 use core_foundation_sys::dictionary::CFMutableDictionaryRef;
 #[cfg(any(feature = "system", feature = "disk"))]
@@ -23,7 +29,10 @@ use libc::c_char;
 #[cfg(any(
     feature = "system",
     feature = "disk",
-    all(feature = "component", any(target_arch = "x86", target_arch = "x86_64")),
+    all(
+        feature = "component",
+        any(target_arch = "x86", target_arch = "x86_64")
+    ),
 ))]
 use libc::kern_return_t;
 
@@ -32,15 +41,21 @@ use libc::kern_return_t;
 #[cfg(any(
     feature = "system",
     feature = "disk",
-    all(feature = "component", any(target_arch = "x86", target_arch = "x86_64")),
+    all(
+        feature = "component",
+        any(target_arch = "x86", target_arch = "x86_64")
+    ),
 ))]
 #[allow(non_camel_case_types)]
 pub type io_object_t = mach_port_t;
 
 #[cfg(any(
     feature = "system",
     feature = "disk",
-    all(feature = "component", any(target_arch = "x86", target_arch = "x86_64")),
+    all(
+        feature = "component",
+        any(target_arch = "x86", target_arch = "x86_64")
+    ),
 ))]
 #[allow(non_camel_case_types)]
 pub type io_iterator_t = io_object_t;
@@ -85,15 +100,21 @@ cfg_if! {
 #[cfg(any(
     feature = "system",
     feature = "disk",
-    all(feature = "component", any(target_arch = "x86", target_arch = "x86_64")),
+    all(
+        feature = "component",
+        any(target_arch = "x86", target_arch = "x86_64")
+    ),
 ))]
 pub const kIOMasterPortDefault: mach_port_t = 0;
 
 // Note: Obtaining information about disks using IOKIt is allowed inside the default macOS App Sandbox.
 #[cfg(any(
     feature = "system",
     feature = "disk",
-    all(feature = "component", any(target_arch = "x86", target_arch = "x86_64")),
+    all(
+        feature = "component",
+        any(target_arch = "x86", target_arch = "x86_64")
+    ),
 ))]
 #[link(name = "IOKit", kind = "framework")]
 extern "C" {
@@ -104,7 +125,10 @@ extern "C" {
     ) -> kern_return_t;
     #[cfg(any(
         feature = "system",
-        all(feature = "component", any(target_arch = "x86", target_arch = "x86_64")),
+        all(
+            feature = "component",
+            any(target_arch = "x86", target_arch = "x86_64")
+        ),
     ))]
     pub fn IOServiceMatching(a: *const c_char) -> CFMutableDictionaryRef;
 
@@ -134,15 +158,15 @@ extern "C" {
     #[cfg(feature = "system")]
     pub fn IORegistryEntryGetName(entry: io_registry_entry_t, name: io_name_t) -> kern_return_t;
     #[cfg(feature = "disk")]
-    pub fn IOObjectConformsTo(
-        object: io_object_t,
-        className: *const c_char,
-    ) -> libc::boolean_t;
+    pub fn IOObjectConformsTo(object: io_object_t, className: *const c_char) -> libc::boolean_t;
 }
 
 #[cfg(any(
     feature = "system",
-    all(feature = "component", any(target_arch = "x86", target_arch = "x86_64")),
+    all(
+        feature = "component",
+        any(target_arch = "x86", target_arch = "x86_64")
+    ),
 ))]
 pub const KIO_RETURN_SUCCESS: i32 = 0;
 
@@ -249,7 +273,11 @@ mod io_service {}
 ))]
 pub use io_service::*;
 
-#[cfg(all(feature = "component", not(feature = "apple-sandbox"), target_arch = "aarch64"))]
+#[cfg(all(
+    feature = "component",
+    not(feature = "apple-sandbox"),
+    target_arch = "aarch64"
+))]
 mod io_service {
     use std::ptr::null;
 
@@ -368,5 +396,9 @@ mod io_service {
     }
 }
 
-#[cfg(all(feature = "component", not(feature = "apple-sandbox"), target_arch = "aarch64"))]
+#[cfg(all(
+    feature = "component",
+    not(feature = "apple-sandbox"),
+    target_arch = "aarch64"
+))]
 pub use io_service::*;

src/unix/apple/macos/mod.rs

@@ -33,3 +33,17 @@ cfg_if! {
         pub mod component;
     }
 }
+
+// Make formattable by rustfmt.
+#[cfg(any())]
+mod component;
+#[cfg(any())]
+mod cpu;
+#[cfg(any())]
+mod disk;
+#[cfg(any())]
+mod process;
+#[cfg(any())]
+mod system;
+#[cfg(any())]
+mod utils;

src/unix/apple/macos/process.rs

@@ -228,7 +228,7 @@ impl ProcessInner {
     }
 
     pub(crate) fn switch_updated(&mut self) -> bool {
-         std::mem::replace(&mut self.updated, false)
+        std::mem::replace(&mut self.updated, false)
     }
 }
 

src/unix/apple/mod.rs

@@ -57,3 +57,25 @@ cfg_if! {
 
 #[doc = include_str!("../../../md_doc/is_supported.md")]
 pub const IS_SUPPORTED_SYSTEM: bool = true;
+
+// Make formattable by rustfmt.
+#[cfg(any())]
+mod component;
+#[cfg(any())]
+mod cpu;
+#[cfg(any())]
+mod disk;
+#[cfg(any())]
+mod groups;
+#[cfg(any())]
+mod ios;
+#[cfg(any())]
+mod macos;
+#[cfg(any())]
+mod network;
+#[cfg(any())]
+mod process;
+#[cfg(any())]
+mod system;
+#[cfg(any())]
+mod users;

src/unix/apple/network.rs

@@ -1,9 +1,12 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use libc::{self, c_char, c_int, c_uint, if_data64, if_msghdr2, sysctl, CTL_NET, IFNAMSIZ, NET_RT_IFLIST2, PF_ROUTE, RTM_IFINFO2};
+use libc::{
+    self, c_char, c_int, c_uint, if_data64, if_msghdr2, sysctl, CTL_NET, IFNAMSIZ, NET_RT_IFLIST2,
+    PF_ROUTE, RTM_IFINFO2,
+};
 
 use std::collections::{hash_map, HashMap};
-use std::mem::{MaybeUninit, size_of};
+use std::mem::{size_of, MaybeUninit};
 use std::ptr::null_mut;
 
 use crate::network::refresh_networks_addresses;
@@ -38,11 +41,27 @@ fn update_network_data(inner: &mut NetworkDataInner, data: &if_data64) {
     update_field(&mut inner.old_out, &mut inner.current_out, data.ifi_obytes);
     update_field(&mut inner.old_in, &mut inner.current_in, data.ifi_ibytes);
 
-    update_field(&mut inner.old_packets_out, &mut inner.packets_out, data.ifi_opackets);
-    update_field(&mut inner.old_packets_in, &mut inner.packets_in, data.ifi_ipackets);
-
-    update_field(&mut inner.old_errors_in, &mut inner.errors_in, data.ifi_ierrors);
-    update_field(&mut inner.old_errors_out, &mut inner.errors_out, data.ifi_oerrors);
+    update_field(
+        &mut inner.old_packets_out,
+        &mut inner.packets_out,
+        data.ifi_opackets,
+    );
+    update_field(
+        &mut inner.old_packets_in,
+        &mut inner.packets_in,
+        data.ifi_ipackets,
+    );
+
+    update_field(
+        &mut inner.old_errors_in,
+        &mut inner.errors_in,
+        data.ifi_ierrors,
+    );
+    update_field(
+        &mut inner.old_errors_out,
+        &mut inner.errors_out,
+        data.ifi_oerrors,
+    );
 }
 
 pub(crate) struct NetworksInner {
@@ -83,7 +102,7 @@ impl NetworksInner {
             NETLINK_GENERIC,
             IFMIB_IFDATA,
             0,
-            IFDATA_GENERAL
+            IFDATA_GENERAL,
         ];
 
         let mut len = 0;
@@ -146,7 +165,14 @@ impl NetworksInner {
                     let mut mib_data: MaybeUninit<ifmibdata> = MaybeUninit::uninit();
 
                     mib2[4] = (*if2m).ifm_index as _;
-                    let ret = sysctl(mib2.as_mut_ptr(), mib2.len() as _, mib_data.as_mut_ptr() as *mut _, &mut size_of::<ifmibdata>(), null_mut(), 0);
+                    let ret = sysctl(
+                        mib2.as_mut_ptr(),
+                        mib2.len() as _,
+                        mib_data.as_mut_ptr() as *mut _,
+                        &mut size_of::<ifmibdata>(),
+                        null_mut(),
+                        0,
+                    );
 
                     match self.interfaces.entry(name) {
                         hash_map::Entry::Occupied(mut e) => {
@@ -198,7 +224,7 @@ impl NetworksInner {
                                 packets_out = data.ifi_opackets;
                                 errors_in = data.ifi_ierrors;
                                 errors_out = data.ifi_oerrors;
-                             }
+                            }
 
                             e.insert(NetworkData {
                                 inner: NetworkDataInner {

src/unix/apple/system.rs

@@ -5,7 +5,10 @@ use crate::sys::cpu::*;
 use crate::sys::process::*;
 use crate::sys::utils::{get_sys_value, get_sys_value_by_name};
 
-use crate::{Cpu, CpuRefreshKind, LoadAvg, MemoryRefreshKind, Pid, Process, ProcessesToUpdate, ProcessRefreshKind};
+use crate::{
+    Cpu, CpuRefreshKind, LoadAvg, MemoryRefreshKind, Pid, Process, ProcessRefreshKind,
+    ProcessesToUpdate,
+};
 
 #[cfg(all(target_os = "macos", not(feature = "apple-sandbox")))]
 use std::cell::UnsafeCell;