fix lint

Author: drunkirishcoder

core/Cargo.toml

@@ -29,8 +29,7 @@ clap = "2.33"
 criterion = { version = "0.3", optional = true }
 futures-lite = "1.11"
 libc = "0.2"
-metrics-core = { version = "0.5", optional = true }
-metrics-runtime = { version = "0.13", optional = true, default-features = false }
+metrics = "0.14"
 once_cell = "1.7"
 proptest = { version = "1.0", optional = true }
 regex = "1"
@@ -44,10 +43,9 @@ criterion = "0.3"
 proptest = { version = "1.0", default-features = false, features = ["default-code-coverage"] }
 
 [features]
-default = ["metrics"]
+default = []
 compile_failure = []    # compiler tests to check mutability rules are followed
-full = ["metrics", "pcap-dump", "testils"]
-metrics = ["metrics-core", "metrics-runtime"]
+full = ["pcap-dump", "testils"]
 pcap-dump = []
 testils = ["criterion", "proptest"]
 

core/src/ffi/dpdk.rs

@@ -132,6 +132,7 @@ pub(crate) fn mempool_lookup<S: Into<String>>(name: S) -> Result<MempoolPtr> {
 }
 
 /// Returns the number of elements which have been allocated from the mempool.
+#[allow(dead_code)]
 pub(crate) fn mempool_in_use_count(mp: &MempoolPtr) -> usize {
     unsafe { cffi::rte_mempool_in_use_count(mp.deref()) as usize }
 }
@@ -197,14 +198,14 @@ pub(crate) fn get_next_lcore(
 
     match unsafe { cffi::rte_get_next_lcore(i, skip_master, wrap) } {
         cffi::RTE_MAX_LCORE => None,
-        id @ _ => Some(LcoreId(id)),
+        id => Some(LcoreId(id)),
     }
 }
 
 /// The function passed to `rte_eal_remote_launch`.
 unsafe extern "C" fn lcore_fn<F>(arg: *mut raw::c_void) -> raw::c_int
 where
-    F: FnOnce() -> () + Send + 'static,
+    F: FnOnce() + Send + 'static,
 {
     let f = Box::from_raw(arg as *mut F);
 
@@ -221,7 +222,7 @@ where
 /// Launches a function on another lcore.
 pub(crate) fn eal_remote_launch<F>(worker_id: LcoreId, f: F) -> Result<()>
 where
-    F: FnOnce() -> () + Send + 'static,
+    F: FnOnce() + Send + 'static,
 {
     let ptr = Box::into_raw(Box::new(f)) as *mut raw::c_void;
 
@@ -299,11 +300,10 @@ pub(crate) fn eth_dev_adjust_nb_rx_tx_desc(
 
 /// Returns the value of promiscuous mode for a device.
 pub(crate) fn eth_promiscuous_get(port_id: PortId) -> bool {
-    match unsafe { cffi::rte_eth_promiscuous_get(port_id.0).into_result(DpdkError::from_errno) } {
-        Ok(1) => true,
-        // assuming port_id is valid, we treat error as mode disabled.
-        _ => false,
-    }
+    let mode =
+        unsafe { cffi::rte_eth_promiscuous_get(port_id.0).into_result(DpdkError::from_errno) };
+    // assuming port_id is valid, treats Ok(0) and Err(_) both as disabled.
+    matches!(mode, Ok(1))
 }
 
 /// Enables receipt in promiscuous mode for a device.
@@ -326,11 +326,10 @@ pub(crate) fn eth_promiscuous_disable(port_id: PortId) -> Result<()> {
 
 /// Returns the value of allmulticast mode for a device.
 pub(crate) fn eth_allmulticast_get(port_id: PortId) -> bool {
-    match unsafe { cffi::rte_eth_allmulticast_get(port_id.0).into_result(DpdkError::from_errno) } {
-        Ok(1) => true,
-        // assuming port_id is valid, we treat error as mode disabled.
-        _ => false,
-    }
+    let mode =
+        unsafe { cffi::rte_eth_allmulticast_get(port_id.0).into_result(DpdkError::from_errno) };
+    // assuming port_id is valid, treats Ok(0) and Err(_) both as disabled.
+    matches!(mode, Ok(1))
 }
 
 /// Enables the receipt of any multicast frame by a device.

core/src/ffi/pcap.rs

@@ -20,7 +20,6 @@ use super::{AsStr, EasyPtr, ToCString, ToResult};
 use crate::ffi::dpdk::MbufPtr;
 use anyhow::Result;
 use capsule_ffi as cffi;
-use libc;
 use std::ops::DerefMut;
 use std::os::raw;
 use std::ptr;

core/src/lib.rs

@@ -82,7 +82,7 @@
 //!
 //! ## Feature flags
 //!
-//! - `default`: Enables metrics by default.
+//! - `default`: None of the features are enabled.
 //! - `pcap-dump`: Enables capturing port traffic to `pcap` files.
 //! - `testils`: Enables utilities for unit testing and benchmarking.
 //! - `full`: Enables all features.
@@ -107,7 +107,6 @@
 //! [rr]: https://rr-project.org/
 //! [README]: https://github.com/capsule-rs/capsule/blob/master/README.md
 //! [sandbox repo]: https://github.com/capsule-rs/sandbox
-//! [`metrics`]: crate::metrics
 //! [kni]: https://github.com/capsule-rs/capsule/tree/master/examples/kni
 //! [nat64]: https://github.com/capsule-rs/capsule/tree/master/examples/nat64
 //! [ping4d]: https://github.com/capsule-rs/capsule/tree/master/examples/ping4d

core/src/packets/mbuf.rs

@@ -365,7 +365,7 @@ impl Mbuf {
     /// free the raw pointer after use. Otherwise the buffer is leaked.
     #[inline]
     pub(crate) fn into_easyptr(self) -> MbufPtr {
-        let ptr = self.inner.ptr().clone();
+        let ptr = *self.inner.ptr();
         mem::forget(self);
         ptr.into()
     }

core/src/runtime/config.rs

@@ -123,7 +123,7 @@ impl RuntimeConfig {
             }
         });
 
-        cores.sort();
+        cores.sort_unstable();
         cores.dedup();
         cores
     }

core/src/runtime/lcore.rs

@@ -156,7 +156,7 @@ mod tests {
 
     #[capsule::test]
     fn get_current_lcore_id_from_non_eal() {
-        let lcore_id = thread::spawn(|| LcoreId::current()).join().expect("panic!");
+        let lcore_id = thread::spawn(LcoreId::current).join().expect("panic!");
 
         assert_eq!(LcoreId::ANY, lcore_id);
     }

core/src/runtime/pcap_dump.rs

@@ -72,6 +72,9 @@ impl Drop for CaptureFile {
 /// The pcap dump manager.
 pub(crate) struct PcapDump {
     output_dir: String,
+    // we need the extra level of indirection because we need stable
+    // pointers to pass to ffi code.
+    #[allow(clippy::vec_box)]
     captures: Vec<Box<CaptureFile>>,
 }
 

core/src/runtime/port.rs

@@ -90,7 +90,7 @@ impl Port {
         self.outbox
             .as_ref()
             .map(|s| Outbox(self.name.clone(), s.clone()))
-            .ok_or(PortError::TxNotEnabled.into())
+            .ok_or_else(|| PortError::TxNotEnabled.into())
     }
 
     /// Spawns the port receiving loop.
@@ -102,7 +102,7 @@ impl Port {
         let shutdown = self.shutdown.as_ref().unwrap();
 
         // can't run loop without assigned rx cores.
-        ensure!(self.rx_lcores.len() > 0, PortError::RxNotEnabled);
+        ensure!(!self.rx_lcores.is_empty(), PortError::RxNotEnabled);
         // pipeline already set if the trigger is waited on.
         ensure!(!shutdown.is_waited(), PortError::PipelineSet);
 
@@ -292,29 +292,23 @@ async fn tx_loop(
     let txq = PortTxQueue { port_id, queue_id };
     let mut ptrs = Vec::with_capacity(batch_size);
 
-    loop {
-        if let Ok(ptr) = receiver.recv().await {
-            ptrs.push(ptr);
-
-            // try to batch the packets up to batch size.
-            for _ in 1..batch_size {
-                match receiver.try_recv() {
-                    Ok(ptr) => ptrs.push(ptr),
-                    // no more packets to batch, ready to transmit.
-                    Err(_) => break,
-                }
+    while let Ok(ptr) = receiver.recv().await {
+        ptrs.push(ptr);
+
+        // try to batch the packets up to batch size.
+        for _ in 1..batch_size {
+            match receiver.try_recv() {
+                Ok(ptr) => ptrs.push(ptr),
+                // no more packets to batch, ready to transmit.
+                Err(_) => break,
             }
+        }
 
-            txq.transmit(&mut ptrs);
+        txq.transmit(&mut ptrs);
 
-            // cooperatively moves to the back of the execution queue,
-            // making room for other tasks before transmitting again.
-            future::yield_now().await;
-        } else {
-            // this branch can only be reached if the channel is closed,
-            // indicating the tx loop should exit.
-            break;
-        }
+        // cooperatively moves to the back of the execution queue,
+        // making room for other tasks before transmitting again.
+        future::yield_now().await;
     }
 
     debug!(port = ?port_name, lcore = ?LcoreId::current(), "tx loop exited.");