Move unix platforms into the same folder to move the unix files into …

…it as well

src/lib.rs

@@ -22,52 +22,24 @@ cfg_if::cfg_if! {
 
         #[cfg(test)]
         pub(crate) const MIN_USERS: usize = 0;
-    } else if #[cfg(any(target_os = "macos", target_os = "ios"))] {
-        mod apple;
-        use apple as sys;
-        pub(crate) mod users;
-        mod network_helper_nix;
-        use network_helper_nix as network_helper;
+    } else if #[cfg(any(
+        target_os = "macos", target_os = "ios",
+        target_os = "linux", target_os = "android",
+        target_os = "freebsd"))]
+    {
+        mod unix;
+        use unix::sys as sys;
+        use unix::{network_helper, users};
         mod network;
 
-        pub(crate) use libc::__error as libc_errno;
-
         #[cfg(test)]
         pub(crate) const MIN_USERS: usize = 1;
     } else if #[cfg(windows)] {
         mod windows;
         use windows as sys;
-        mod network_helper_win;
-        use network_helper_win as network_helper;
-        mod network;
-
-        #[cfg(test)]
-        pub(crate) const MIN_USERS: usize = 1;
-    } else if #[cfg(any(target_os = "linux", target_os = "android"))] {
-        mod linux;
-        use linux as sys;
-        pub(crate) mod users;
-        mod network_helper_nix;
-        use network_helper_nix as network_helper;
+        use window::network_helper;
         mod network;
 
-        #[cfg(target_os = "linux")]
-        pub(crate) use libc::__errno_location as libc_errno;
-        #[cfg(target_os = "android")]
-        pub(crate) use libc::__errno as libc_errno;
-
-        #[cfg(test)]
-        pub(crate) const MIN_USERS: usize = 1;
-    } else if #[cfg(target_os = "freebsd")] {
-        mod freebsd;
-        use freebsd as sys;
-        pub(crate) mod users;
-        mod network_helper_nix;
-        use network_helper_nix as network_helper;
-        mod network;
-
-        pub(crate) use libc::__error as libc_errno;
-
         #[cfg(test)]
         pub(crate) const MIN_USERS: usize = 1;
     } else {

src/macros.rs

@@ -60,7 +60,7 @@ macro_rules! declare_signals {
 #[cfg(all(unix, not(feature = "unknown-ci")))]
 macro_rules! retry_eintr {
     (set_to_0 => $($t:tt)+) => {{
-        let errno = crate::libc_errno();
+        let errno = crate::unix::libc_errno();
         if !errno.is_null() {
             *errno = 0;
         }

src/apple/app_store/component.rs → src/unix/apple/app_store/component.rs

@@ -2,7 +2,7 @@
 
 use crate::ComponentExt;
 
-#[doc = include_str!("../../../md_doc/component.md")]
+#[doc = include_str!("../../../../md_doc/component.md")]
 pub struct Component {}
 
 impl ComponentExt for Component {

src/apple/app_store/process.rs → src/unix/apple/app_store/process.rs

@@ -4,7 +4,7 @@ use std::path::Path;
 
 use crate::{DiskUsage, Gid, Pid, ProcessExt, ProcessStatus, Signal, Uid};
 
-#[doc = include_str!("../../../md_doc/process.md")]
+#[doc = include_str!("../../../../md_doc/process.md")]
 pub struct Process;
 
 impl ProcessExt for Process {

src/apple/cpu.rs → src/unix/apple/cpu.rs

@@ -103,7 +103,7 @@ impl Drop for CpuData {
     }
 }
 
-#[doc = include_str!("../../md_doc/cpu.md")]
+#[doc = include_str!("../../../md_doc/cpu.md")]
 pub struct Cpu {
     name: String,
     cpu_usage: f32,

src/apple/disk.rs → src/unix/apple/disk.rs

@@ -19,7 +19,7 @@ use std::os::unix::ffi::OsStrExt;
 use std::path::{Path, PathBuf};
 use std::ptr;
 
-#[doc = include_str!("../../md_doc/disk.md")]
+#[doc = include_str!("../../../md_doc/disk.md")]
 pub struct Disk {
     pub(crate) type_: DiskKind,
     pub(crate) name: OsString,

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

@@ -8,7 +8,7 @@ use core_foundation_sys::string::{
     kCFStringEncodingUTF8, CFStringCreateWithBytes, CFStringGetCStringPtr,
 };
 
-use crate::apple::inner::ffi::{
+use crate::sys::inner::ffi::{
     kHIDPage_AppleVendor, kHIDUsage_AppleVendor_TemperatureSensor, kIOHIDEventTypeTemperature,
     matching, IOHIDEventFieldBase, IOHIDEventGetFloatValue, IOHIDEventSystemClientCopyServices,
     IOHIDEventSystemClientCreate, IOHIDEventSystemClientSetMatching, IOHIDServiceClientCopyEvent,
@@ -109,7 +109,7 @@ impl Components {
 unsafe impl Send for Components {}
 unsafe impl Sync for Components {}
 
-#[doc = include_str!("../../../../md_doc/component.md")]
+#[doc = include_str!("../../../../../md_doc/component.md")]
 pub struct Component {
     service: CFReleaser<__IOHIDServiceClient>,
     temperature: f32,

src/apple/macos/component/x86.rs → src/unix/apple/macos/component/x86.rs

@@ -77,7 +77,7 @@ impl Components {
     }
 }
 
-#[doc = include_str!("../../../../md_doc/component.md")]
+#[doc = include_str!("../../../../../md_doc/component.md")]
 pub struct Component {
     temperature: f32,
     max: f32,

src/apple/macos/process.rs → src/unix/apple/macos/process.rs

@@ -14,7 +14,7 @@ use crate::{DiskUsage, Gid, Pid, ProcessExt, ProcessRefreshKind, ProcessStatus,
 use crate::sys::process::ThreadStatus;
 use crate::sys::system::Wrap;
 
-#[doc = include_str!("../../../md_doc/process.md")]
+#[doc = include_str!("../../../../md_doc/process.md")]
 pub struct Process {
     pub(crate) name: String,
     pub(crate) cmd: Vec<String>,
@@ -316,7 +316,7 @@ fn check_if_pid_is_alive(pid: Pid, check_if_alive: bool) -> bool {
             return true;
         }
         // `kill` failed but it might not be because the process is dead.
-        let errno = crate::libc_errno();
+        let errno = crate::unix::libc_errno();
         // If errno is equal to ESCHR, it means the process is dead.
         !errno.is_null() && *errno != libc::ESRCH
     }

src/apple/network.rs → src/unix/apple/network.rs

@@ -164,7 +164,7 @@ impl NetworksExt for Networks {
     }
 }
 
-#[doc = include_str!("../../md_doc/network_data.md")]
+#[doc = include_str!("../../../md_doc/network_data.md")]
 #[derive(PartialEq, Eq)]
 pub struct NetworkData {
     current_in: u64,

src/apple/system.rs → src/unix/apple/system.rs

@@ -74,7 +74,7 @@ declare_signals! {
     _ => None,
 }
 
-#[doc = include_str!("../../md_doc/system.md")]
+#[doc = include_str!("../../../md_doc/system.md")]
 pub struct System {
     process_list: HashMap<Pid, Process>,
     mem_total: u64,
@@ -327,7 +327,7 @@ impl SystemExt for System {
     }
 
     fn refresh_users_list(&mut self) {
-        self.users = crate::apple::users::get_users_list();
+        self.users = crate::sys::users::get_users_list();
     }
 
     // COMMON PART

src/freebsd/component.rs → src/unix/freebsd/component.rs

@@ -3,7 +3,7 @@
 use super::utils::get_sys_value_by_name;
 use crate::ComponentExt;
 
-#[doc = include_str!("../../md_doc/component.md")]
+#[doc = include_str!("../../../md_doc/component.md")]
 pub struct Component {
     id: Vec<u8>,
     label: String,

src/freebsd/cpu.rs → src/unix/freebsd/cpu.rs

@@ -132,7 +132,7 @@ impl CpusWrapper {
     }
 }
 
-#[doc = include_str!("../../md_doc/cpu.md")]
+#[doc = include_str!("../../../md_doc/cpu.md")]
 pub struct Cpu {
     pub(crate) cpu_usage: f32,
     name: String,

src/freebsd/disk.rs → src/unix/freebsd/disk.rs

@@ -7,7 +7,7 @@ use std::path::{Path, PathBuf};
 
 use super::utils::c_buf_to_str;
 
-#[doc = include_str!("../../md_doc/disk.md")]
+#[doc = include_str!("../../../md_doc/disk.md")]
 pub struct Disk {
     name: OsString,
     c_mount_point: Vec<libc::c_char>,

src/freebsd/network.rs → src/unix/freebsd/network.rs

@@ -113,7 +113,7 @@ impl Networks {
     }
 }
 
-#[doc = include_str!("../../md_doc/network_data.md")]
+#[doc = include_str!("../../../md_doc/network_data.md")]
 pub struct NetworkData {
     /// Total number of bytes received over interface.
     ifi_ibytes: u64,

src/freebsd/process.rs → src/unix/freebsd/process.rs

@@ -40,7 +40,7 @@ impl fmt::Display for ProcessStatus {
     }
 }
 
-#[doc = include_str!("../../md_doc/process.md")]
+#[doc = include_str!("../../../md_doc/process.md")]
 pub struct Process {
     pub(crate) name: String,
     pub(crate) cmd: Vec<String>,

src/freebsd/system.rs → src/unix/freebsd/system.rs

@@ -57,7 +57,7 @@ declare_signals! {
     _ => None,
 }
 
-#[doc = include_str!("../../md_doc/system.md")]
+#[doc = include_str!("../../../md_doc/system.md")]
 pub struct System {
     process_list: HashMap<Pid, Process>,
     mem_total: u64,

src/linux/component.rs → src/unix/linux/component.rs

@@ -11,7 +11,7 @@ use std::fs::{read_dir, File};
 use std::io::Read;
 use std::path::{Path, PathBuf};
 
-#[doc = include_str!("../../md_doc/component.md")]
+#[doc = include_str!("../../../md_doc/component.md")]
 #[derive(Default)]
 pub struct Component {
     /// Optional associated device of a `Component`.

src/linux/cpu.rs → src/unix/linux/cpu.rs

@@ -305,7 +305,7 @@ impl CpuValues {
     }
 }
 
-#[doc = include_str!("../../md_doc/cpu.md")]
+#[doc = include_str!("../../../md_doc/cpu.md")]
 pub struct Cpu {
     old_values: CpuValues,
     new_values: CpuValues,

src/linux/disk.rs → src/unix/linux/disk.rs

@@ -16,7 +16,7 @@ macro_rules! cast {
     };
 }
 
-#[doc = include_str!("../../md_doc/disk.md")]
+#[doc = include_str!("../../../md_doc/disk.md")]
 #[derive(PartialEq, Eq)]
 pub struct Disk {
     type_: DiskKind,

src/linux/network.rs → src/unix/linux/network.rs

@@ -126,7 +126,7 @@ impl NetworksExt for Networks {
     }
 }
 
-#[doc = include_str!("../../md_doc/network_data.md")]
+#[doc = include_str!("../../../md_doc/network_data.md")]
 pub struct NetworkData {
     /// Total number of bytes received over interface.
     rx_bytes: u64,

src/linux/process.rs → src/unix/linux/process.rs

@@ -56,7 +56,7 @@ impl fmt::Display for ProcessStatus {
     }
 }
 
-#[doc = include_str!("../../md_doc/process.md")]
+#[doc = include_str!("../../../md_doc/process.md")]
 pub struct Process {
     pub(crate) name: String,
     pub(crate) cmd: Vec<String>,

src/linux/system.rs → src/unix/linux/system.rs

@@ -147,7 +147,7 @@ declare_signals! {
     Signal::Sys => libc::SIGSYS,
 }
 
-#[doc = include_str!("../../md_doc/system.md")]
+#[doc = include_str!("../../../md_doc/system.md")]
 pub struct System {
     process_list: Process,
     mem_total: u64,

src/unix/mod.rs

@@ -0,0 +1,28 @@
+// Take a look at the license at the top of the repository in the LICENSE file.
+
+cfg_if::cfg_if! {
+    if #[cfg(any(target_os = "macos", target_os = "ios"))] {
+        pub(crate) mod apple;
+        pub(crate) use apple as sys;
+
+        pub(crate) use libc::__error as libc_errno;
+    } else if #[cfg(any(target_os = "linux", target_os = "android"))] {
+        pub(crate) mod linux;
+        pub(crate) use linux as sys;
+
+        #[cfg(target_os = "linux")]
+        pub(crate) use libc::__errno_location as libc_errno;
+        #[cfg(target_os = "android")]
+        pub(crate) use libc::__errno as libc_errno;
+    } else if #[cfg(target_os = "freebsd")] {
+        pub(crate) mod freebsd;
+        pub(crate) use freebsd as sys;
+
+        pub(crate) use libc::__error as libc_errno;
+    } else {
+        compile_error!("Invalid cfg!");
+    }
+}
+
+pub(crate) mod network_helper;
+pub(crate) mod users;

src/users.rs → src/unix/users.rs

@@ -9,7 +9,7 @@ use libc::{getgrgid_r, getgrouplist};
 use std::fs::File;
 use std::io::Read;
 
-#[doc = include_str!("../md_doc/user.md")]
+#[doc = include_str!("../../md_doc/user.md")]
 pub struct User {
     pub(crate) uid: Uid,
     pub(crate) gid: Gid,

src/windows/mod.rs

@@ -4,6 +4,7 @@ mod component;
 mod cpu;
 mod disk;
 mod network;
+pub(crate) mod network_helper;
 mod process;
 mod sid;
 mod system;