Merge pull request #219 from tatref/fix-warning

Fix doc and clippy warnings

Author: eminence

src/diskstats.rs

@@ -103,7 +103,7 @@ pub fn diskstats() -> ProcResult<Vec<DiskStat>> {
 
 impl DiskStat {
     pub fn from_line(line: &str) -> ProcResult<DiskStat> {
-        let mut s = line.trim().split_whitespace();
+        let mut s = line.split_whitespace();
 
         let major = from_str!(i32, expect!(s.next()));
         let minor = from_str!(i32, expect!(s.next()));

src/lib.rs

@@ -369,7 +369,7 @@ struct FileWrapper {
 impl FileWrapper {
     fn open<P: AsRef<Path>>(path: P) -> Result<FileWrapper, io::Error> {
         let p = path.as_ref();
-        let f = wrap_io_error!(p, File::open(&p))?;
+        let f = wrap_io_error!(p, File::open(p))?;
         Ok(FileWrapper {
             inner: f,
             path: p.to_owned(),
@@ -671,7 +671,7 @@ pub fn page_size() -> std::io::Result<u64> {
 }
 
 /// Possible values for a kernel config option
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum ConfigSetting {
     Yes,
     Module,

src/locks.rs

@@ -150,7 +150,7 @@ pub struct Lock {
 
 impl Lock {
     fn from_line(line: &str) -> ProcResult<Lock> {
-        let mut s = line.trim().split_whitespace();
+        let mut s = line.split_whitespace();
 
         let _ = expect!(s.next());
         let typ = {

src/net.rs

@@ -63,7 +63,7 @@ use std::{path::PathBuf, str::FromStr};
 #[cfg(feature = "serde1")]
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub enum TcpState {
     Established = 1,
@@ -117,7 +117,7 @@ impl TcpState {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub enum UdpState {
     Established = 1,
@@ -141,7 +141,7 @@ impl UdpState {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub enum UnixState {
     UNCONNECTED = 1,
@@ -227,7 +227,7 @@ fn parse_addressport_str(s: &str) -> ProcResult<SocketAddr> {
     let port = from_str!(u16, port, 16);
 
     if ip_part.len() == 8 {
-        let bytes = expect!(hex::decode(&ip_part));
+        let bytes = expect!(hex::decode(ip_part));
         let ip_u32 = NetworkEndian::read_u32(&bytes);
 
         let ip = Ipv4Addr::new(
@@ -239,7 +239,7 @@ fn parse_addressport_str(s: &str) -> ProcResult<SocketAddr> {
 
         Ok(SocketAddr::V4(SocketAddrV4::new(ip, port)))
     } else if ip_part.len() == 32 {
-        let bytes = expect!(hex::decode(&ip_part));
+        let bytes = expect!(hex::decode(ip_part));
 
         let ip_a = NativeEndian::read_u32(&bytes[0..]);
         let ip_b = NativeEndian::read_u32(&bytes[4..]);
@@ -581,7 +581,7 @@ pub struct DeviceStatus {
 
 impl DeviceStatus {
     fn from_str(s: &str) -> ProcResult<DeviceStatus> {
-        let mut split = s.trim().split_whitespace();
+        let mut split = s.split_whitespace();
         let name: String = expect!(from_iter(&mut split));
         let recv_bytes = expect!(from_iter(&mut split));
         let recv_packets = expect!(from_iter(&mut split));

src/pressure.rs

@@ -1,9 +1,9 @@
 //! Pressure stall information retreived from `/proc/pressure/cpu`,
 //! `/proc/pressure/memory` and `/proc/pressure/io`
 //! may not be available on kernels older than 4.20.0
-//! For reference: https://lwn.net/Articles/759781/
+//! For reference: <https://lwn.net/Articles/759781/>
 //!
-//! See also: https://www.kernel.org/doc/Documentation/accounting/psi.txt
+//! See also: <https://www.kernel.org/doc/Documentation/accounting/psi.txt>
 
 use crate::{ProcError, ProcResult};
 use std::collections::HashMap;
@@ -13,7 +13,7 @@ use serde::{Deserialize, Serialize};
 
 /// Pressure stall information for either CPU, memory, or IO.
 ///
-/// See also: https://www.kernel.org/doc/Documentation/accounting/psi.txt
+/// See also: <https://www.kernel.org/doc/Documentation/accounting/psi.txt>
 #[derive(Debug, Clone)]
 #[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct PressureRecord {

src/process/mod.rs

@@ -60,7 +60,7 @@ use super::*;
 use crate::from_iter;
 use crate::net::{read_tcp_table, read_udp_table, TcpNetEntry, UdpNetEntry};
 
-use rustix::fd::{AsFd, BorrowedFd, RawFd, OwnedFd};
+use rustix::fd::{AsFd, BorrowedFd, OwnedFd, RawFd};
 use rustix::fs::{AtFlags, Mode, OFlags, RawMode};
 #[cfg(feature = "serde1")]
 use serde::{Deserialize, Serialize};
@@ -806,7 +806,7 @@ impl Process {
         let file = wrap_io_error!(
             root,
             rustix::fs::openat(
-                &rustix::fs::cwd(),
+                rustix::fs::cwd(),
                 &root,
                 OFlags::PATH | OFlags::DIRECTORY | OFlags::CLOEXEC,
                 Mode::empty()
@@ -823,7 +823,7 @@ impl Process {
             })
             .and_then(|s| s.to_string_lossy().parse::<i32>().ok())
             .or_else(|| {
-                rustix::fs::readlinkat(&rustix::fs::cwd(), &root, Vec::new())
+                rustix::fs::readlinkat(rustix::fs::cwd(), &root, Vec::new())
                     .ok()
                     .and_then(|s| s.to_string_lossy().parse::<i32>().ok())
             });
@@ -1521,7 +1521,7 @@ pub fn all_processes_with_root(root: impl AsRef<Path>) -> ProcResult<ProcessesIt
     let dir = wrap_io_error!(
         root,
         rustix::fs::openat(
-            &rustix::fs::cwd(),
+            rustix::fs::cwd(),
             root,
             OFlags::RDONLY | OFlags::DIRECTORY | OFlags::CLOEXEC,
             Mode::empty()

src/process/namespaces.rs

@@ -10,7 +10,7 @@ use super::Process;
 
 impl Process {
     /// Describes namespaces to which the process with the corresponding PID belongs.
-    /// Doc reference: https://man7.org/linux/man-pages/man7/namespaces.7.html
+    /// Doc reference: <https://man7.org/linux/man-pages/man7/namespaces.7.html>
     /// The namespace type is the key for the HashMap, i.e 'net', 'user', etc.
     pub fn namespaces(&self) -> ProcResult<HashMap<OsString, Namespace>> {
         let mut namespaces = HashMap::new();

src/sys/kernel/random.rs

@@ -72,7 +72,7 @@ mod tests {
     fn test_poolsize() {
         // The kernel support section in the root lib.rs file says that we only aim to support >= 2.6 kernels,
         // so only test that case
-        let poolsize = poolsize().unwrap();
+        let _poolsize = poolsize().unwrap();
     }
 
     #[test]

src/sys/vm.rs

@@ -38,7 +38,7 @@ pub fn compact_memory() -> ProcResult<()> {
 }
 
 /// drop clean caches, dentries, and inodes from memory, causing that memory to become free.
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum DropCache {
     /// default
     Default = 0,