Add derive traits (i.e., Clone, etc.)

Cargo.toml

@@ -109,6 +109,7 @@ cargo-args = ["-Zbuild-std"]
 rustdoc-args = ["--generate-link-to-definition"]
 
 [dependencies]
+derivative = "2.2.0"
 memchr = { version = "2.5", optional = true }
 rayon = { version = "^1.8", optional = true }
 serde = { version = "^1.0.190", optional = true, features = ["derive"] }

src/common/disk.rs

@@ -17,6 +17,7 @@ use crate::DiskUsage;
 ///     println!("{:?}: {:?}", disk.name(), disk.kind());
 /// }
 /// ```
+#[derive(Clone, PartialEq, Eq)]
 pub struct Disk {
     pub(crate) inner: crate::DiskInner,
 }
@@ -198,6 +199,7 @@ impl Disk {
 /// feature must be enabled. Note, however, that sysinfo may hang under certain
 /// circumstances. For example, if a CIFS or NFS share has been mounted with
 /// the _hard_ option, but the connection has an error, such as the share server has stopped.
+#[derive(Clone, PartialEq, Eq)]
 pub struct Disks {
     inner: crate::DisksInner,
 }

src/common/mod.rs

@@ -43,6 +43,7 @@ pub(crate) mod user;
 /// ```
 #[cfg(any(feature = "disk", feature = "system"))]
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub struct DiskUsage {
     /// Total number of written bytes.
     pub total_written_bytes: u64,
@@ -109,6 +110,7 @@ macro_rules! gid {
         xid!(
             /// A group id wrapping a platform specific type.
             #[derive(Copy)]
+            #[cfg_attr(feature = "serde", derive(serde::Deserialize))]
             Gid,
             $type,
             std::str::FromStr
@@ -129,6 +131,16 @@ cfg_if! {
     ))] {
         uid!(libc::uid_t, std::str::FromStr);
         gid!(libc::gid_t);
+
+        #[cfg(all(feature = "serde", any(feature = "system", feature = "user")))]
+        impl<'de> serde::Deserialize<'de> for Uid {
+            fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+               Ok(Self(libc::uid_t::deserialize(deserializer)?))
+            }
+        }
     } else if #[cfg(windows)] {
         uid!(crate::windows::Sid);
         gid!(u32);
@@ -141,8 +153,28 @@ cfg_if! {
                 Ok(Self(t.parse()?))
             }
         }
+
+        #[cfg(all(feature = "serde", any(feature = "system", feature = "user")))]
+        impl<'de> serde::Deserialize<'de> for Uid {
+            fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+               Ok(Self(crate::windows::Sid::deserialize(deserializer)?))
+            }
+        }
     } else {
         uid!(u32, std::str::FromStr);
         gid!(u32);
+
+        #[cfg(feature = "serde")]
+        impl<'de> serde::Deserialize<'de> for Uid {
+            fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+               Ok(Self(u32::deserialize(deserializer)?))
+            }
+        }
     }
 }

src/common/network.rs

@@ -18,6 +18,8 @@ use crate::{NetworkDataInner, NetworksInner};
 ///     println!("[{interface_name}]: {network:?}");
 /// }
 /// ```
+#[derive(Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub struct Networks {
     pub(crate) inner: NetworksInner,
 }
@@ -120,6 +122,8 @@ impl std::ops::Deref for Networks {
 ///     println!("[{interface_name}] {network:?}");
 /// }
 /// ```
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub struct NetworkData {
     pub(crate) inner: NetworkDataInner,
 }

src/common/system.rs

@@ -1007,7 +1007,7 @@ impl std::fmt::Display for Signal {
 }
 
 /// Contains memory limits for the current process.
-#[derive(Default, Debug, Clone)]
+#[derive(Default, Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct CGroupLimits {
     /// Total memory (in bytes) for the current cgroup.
     pub total_memory: u64,
@@ -1138,7 +1138,7 @@ pub enum ProcessStatus {
 }
 
 /// Enum describing the different kind of threads.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub enum ThreadKind {
     /// Kernel thread.
@@ -1816,8 +1816,28 @@ cfg_if! {
         use libc::pid_t;
 
         pid_decl!(pid_t);
+
+        #[cfg(feature = "serde")]
+        impl<'de> serde::Deserialize<'de> for Pid {
+            fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+               Ok(Self(pid_t::deserialize(deserializer)?))
+            }
+        }
     } else {
         pid_decl!(usize);
+
+         #[cfg(feature = "serde")]
+        impl<'de> serde::Deserialize<'de> for Pid {
+            fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+               Ok(Self(usize::deserialize(deserializer)?))
+            }
+        }
     }
 }
 
@@ -1836,7 +1856,7 @@ cfg_if! {
 ///     ProcessRefreshKind::nothing().with_exe(UpdateKind::OnlyIfNotSet),
 /// );
 /// ```
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
 pub enum UpdateKind {
     /// Never update the related information.
     #[default]
@@ -1927,7 +1947,7 @@ pub enum ProcessesToUpdate<'a> {
 /// ```
 ///
 /// [`Process`]: crate::Process
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub struct ProcessRefreshKind {
     cpu: bool,
     disk_usage: bool,
@@ -2074,7 +2094,7 @@ It will retrieve the following information:
 /// ```
 ///
 /// [`Cpu`]: crate::Cpu
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
 pub struct CpuRefreshKind {
     cpu_usage: bool,
     frequency: bool,
@@ -2133,7 +2153,7 @@ impl CpuRefreshKind {
 /// println!("total RAM: {}", system.total_memory());
 /// println!("free RAM:  {}", system.free_memory());
 /// ```
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
 pub struct MemoryRefreshKind {
     ram: bool,
     swap: bool,
@@ -2192,7 +2212,7 @@ impl MemoryRefreshKind {
 /// assert!(system.processes().len() > 0);
 /// # }
 /// ```
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
 pub struct RefreshKind {
     processes: Option<ProcessRefreshKind>,
     memory: Option<MemoryRefreshKind>,

src/common/user.rs

@@ -16,6 +16,8 @@ use crate::{Gid, Uid, UserInner};
 ///     println!("{:?}", user);
 /// }
 /// ```
+#[derive(Clone)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub struct User {
     pub(crate) inner: UserInner,
 }
@@ -109,7 +111,8 @@ impl User {
     }
 }
 
-#[derive(PartialEq, Eq, PartialOrd, Ord, Debug)]
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub(crate) struct GroupInner {
     pub(crate) id: Gid,
     pub(crate) name: String,
@@ -136,7 +139,8 @@ pub(crate) struct GroupInner {
 ///     }
 /// }
 /// ```
-#[derive(PartialEq, Eq, PartialOrd, Ord, Debug)]
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub struct Group {
     pub(crate) inner: GroupInner,
 }
@@ -189,6 +193,8 @@ impl Group {
 ///     println!("{} is in {} groups", user.name(), user.groups().len());
 /// }
 /// ```
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub struct Users {
     users: Vec<User>,
 }
@@ -360,6 +366,8 @@ impl Users {
 ///     println!("{}", group.name());
 /// }
 /// ```
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub struct Groups {
     groups: Vec<Group>,
 }

src/unix/apple/disk.rs

@@ -19,6 +19,7 @@ use std::os::unix::ffi::{OsStrExt, OsStringExt};
 use std::path::{Path, PathBuf};
 use std::ptr;
 
+#[derive(Clone, PartialEq, Eq)]
 pub(crate) struct DiskInner {
     pub(crate) type_: DiskKind,
     pub(crate) name: OsString,

src/unix/apple/network.rs

@@ -64,6 +64,8 @@ fn update_network_data(inner: &mut NetworkDataInner, data: &if_data64) {
     );
 }
 
+#[derive(Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub(crate) struct NetworksInner {
     pub(crate) interfaces: HashMap<String, NetworkData>,
 }
@@ -252,7 +254,8 @@ impl NetworksInner {
     }
 }
 
-#[derive(PartialEq, Eq)]
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub(crate) struct NetworkDataInner {
     current_in: u64,
     old_in: u64,

src/unix/apple/process.rs

@@ -48,6 +48,7 @@ impl fmt::Display for ProcessStatus {
 
 /// Enum describing the different status of a thread.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub(crate) enum ThreadStatus {
     /// Thread is running normally.
     Running,

src/unix/freebsd/disk.rs

@@ -18,7 +18,7 @@ use super::ffi::{
 use super::utils::{c_buf_to_utf8_str, get_sys_value_str_by_name};
 use crate::{Disk, DiskKind, DiskRefreshKind, DiskUsage};
 
-#[derive(Debug)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub(crate) struct DiskInner {
     name: OsString,
     c_mount_point: Vec<libc::c_char>,

src/unix/freebsd/network.rs

@@ -14,6 +14,8 @@ macro_rules! old_and_new {
     }};
 }
 
+#[derive(Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub(crate) struct NetworksInner {
     pub(crate) interfaces: HashMap<String, NetworkData>,
 }
@@ -131,6 +133,8 @@ impl NetworksInner {
     }
 }
 
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub(crate) struct NetworkDataInner {
     /// Total number of bytes received over interface.
     ifi_ibytes: u64,

src/unix/freebsd/process.rs

@@ -40,6 +40,9 @@ impl fmt::Display for ProcessStatus {
     }
 }
 
+#[derive(Clone, derivative::Derivative)]
+#[derivative(PartialEq, Eq, PartialOrd, Ord)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub(crate) struct ProcessInner {
     pub(crate) name: OsString,
     pub(crate) cmd: Vec<OsString>,
@@ -52,6 +55,7 @@ pub(crate) struct ProcessInner {
     pub(crate) memory: u64,
     pub(crate) virtual_memory: u64,
     pub(crate) updated: bool,
+    #[derivative(Ord = "ignore", PartialEq = "ignore")]
     cpu_usage: f32,
     start_time: u64,
     run_time: u64,

src/unix/linux/disk.rs

@@ -34,6 +34,7 @@ macro_rules! cast {
     };
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub(crate) struct DiskInner {
     type_: DiskKind,
     device_name: OsString,

src/unix/linux/network.rs

@@ -128,6 +128,8 @@ fn refresh_networks_list_from_sysfs(
     }
 }
 
+#[derive(Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub(crate) struct NetworksInner {
     pub(crate) interfaces: HashMap<String, NetworkData>,
 }
@@ -153,6 +155,8 @@ impl NetworksInner {
     }
 }
 
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub(crate) struct NetworkDataInner {
     /// Total number of bytes received over interface.
     rx_bytes: u64,