Fix some clippy lints

ethtool/examples/dump_coalesce.rs

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-use ethtool;
 use futures::stream::TryStreamExt;
-use tokio;
 
 // Once we find a way to load netsimdev kernel module in CI, we can convert this
 // to a test
@@ -24,7 +22,7 @@ async fn get_coalesce(iface_name: Option<&str>) {
     while let Some(msg) = coalesce_handle.try_next().await.unwrap() {
         msgs.push(msg);
     }
-    assert!(msgs.len() > 0);
+    assert!(!msgs.is_empty());
     for msg in msgs {
         println!("{:?}", msg);
     }

ethtool/examples/dump_features.rs

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-use ethtool;
 use futures::stream::TryStreamExt;
-use tokio;
 
 // Once we find a way to load netsimdev kernel module in CI, we can convert this
 // to a test
@@ -24,7 +22,7 @@ async fn get_feature(iface_name: Option<&str>) {
     while let Some(msg) = feature_handle.try_next().await.unwrap() {
         msgs.push(msg);
     }
-    assert!(msgs.len() > 0);
+    assert!(!msgs.is_empty());
     for msg in msgs {
         println!("{:?}", msg);
     }

ethtool/examples/dump_link_mode.rs

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-use ethtool;
 use futures::stream::TryStreamExt;
-use tokio;
 
 // Once we find a way to load netsimdev kernel module in CI, we can convert this
 // to a test
@@ -24,7 +22,7 @@ async fn get_link_mode(iface_name: Option<&str>) {
     while let Some(msg) = link_mode_handle.try_next().await.unwrap() {
         msgs.push(msg);
     }
-    assert!(msgs.len() > 0);
+    assert!(!msgs.is_empty());
     for msg in msgs {
         println!("{:?}", msg);
     }

ethtool/examples/dump_pause.rs

@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-use env_logger;
-use ethtool;
 use futures::stream::TryStreamExt;
-use tokio;
 
 // Once we find a way to load netsimdev kernel module in CI, we can convert this
 // to a test
@@ -26,6 +23,6 @@ async fn get_pause(iface_name: Option<&str>) {
     while let Some(msg) = pause_handle.try_next().await.unwrap() {
         msgs.push(msg);
     }
-    assert!(msgs.len() > 0);
+    assert!(!msgs.is_empty());
     println!("{:?}", msgs);
 }

ethtool/examples/dump_rings.rs

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-use ethtool;
 use futures::stream::TryStreamExt;
-use tokio;
 
 // Once we find a way to load netsimdev kernel module in CI, we can convert this
 // to a test
@@ -24,7 +22,7 @@ async fn get_ring(iface_name: Option<&str>) {
     while let Some(msg) = ring_handle.try_next().await.unwrap() {
         msgs.push(msg);
     }
-    assert!(msgs.len() > 0);
+    assert!(!msgs.is_empty());
     for msg in msgs {
         println!("{:?}", msg);
     }

ethtool/tests/dump_link_modes.rs

@@ -22,7 +22,7 @@ async fn dump_link_modes() {
     while let Some(msg) = link_modes_handle.try_next().await.unwrap() {
         msgs.push(msg);
     }
-    assert!(msgs.len() >= 1);
+    assert!(!msgs.is_empty());
     let ethtool_msg = &msgs[0].payload;
     println!("ethtool_msg {:?}", &ethtool_msg);
 

netlink-packet-core/src/buffer.rs

@@ -385,7 +385,7 @@ mod tests {
             packet.set_message_type(RTM_GETLINK);
             packet.set_sequence_number(1526271540);
             packet.set_port_number(0);
-            packet.set_flags(From::from(NLM_F_ROOT | NLM_F_REQUEST | NLM_F_MATCH));
+            packet.set_flags((NLM_F_ROOT | NLM_F_REQUEST | NLM_F_MATCH));
             packet
                 .payload_mut()
                 .copy_from_slice(&IP_LINK_SHOW_PKT[16..]);

netlink-packet-route/benches/link_message.rs

@@ -45,7 +45,7 @@ fn b1(c: &mut Criterion) {
 
     c.bench_function("parse LinkMessage nlas", |b| {
         b.iter(|| {
-            Vec::<Nla>::parse_with_param(&LinkMessageBuffer::new(&&LINKMSG1[..]), 0 as u8).unwrap();
+            Vec::<Nla>::parse_with_param(&LinkMessageBuffer::new(&&LINKMSG1[..]), 0_u8).unwrap();
         })
     });
 

netlink-packet-route/benches/rtnetlink_dump.rs

@@ -17,7 +17,7 @@ fn bench(c: &mut Criterion) {
         b.iter(|| {
             for (i, buf) in packets.iter().enumerate() {
                 NetlinkMessage::<RtnlMessage>::deserialize(&buf[16..])
-                    .expect(&format!("message {} failed", i));
+                    .unwrap_or_else(|_| panic!("message {} failed", i));
             }
         })
     });

netlink-packet-route/src/rtnl/link/nlas/af_spec_inet.rs

@@ -138,7 +138,7 @@ impl nlas::Nla for AfSpecInet {
                 | Ieee802154(ref bytes)
                 | Caif(ref bytes)
                 | Alg(ref bytes)
-                => (&mut buffer[..bytes.len()]).copy_from_slice(bytes.as_slice()),
+                => buffer[..bytes.len()].copy_from_slice(bytes.as_slice()),
             Inet6(ref nlas) => nlas.as_slice().emit(buffer),
             Inet(ref nlas) => nlas.as_slice().emit(buffer),
             Other(ref nla)  => nla.emit_value(buffer),

netlink-packet-route/src/rtnl/link/nlas/inet/mod.rs

@@ -32,7 +32,7 @@ impl Nla for Inet {
     fn emit_value(&self, buffer: &mut [u8]) {
         use self::Inet::*;
         match *self {
-            Unspec(ref bytes) => (&mut buffer[..bytes.len()]).copy_from_slice(bytes.as_slice()),
+            Unspec(ref bytes) => buffer[..bytes.len()].copy_from_slice(bytes.as_slice()),
             DevConf(ref dev_conf) => buffer[..dev_conf.len()].copy_from_slice(dev_conf.as_slice()),
             Other(ref nla) => nla.emit_value(buffer),
         }

netlink-packet-sock-diag/examples/dump_ipv4.rs

@@ -22,7 +22,7 @@ fn main() {
         },
         payload: SockDiagMessage::InetRequest(InetRequest {
             family: AF_INET,
-            protocol: IPPROTO_TCP.into(),
+            protocol: IPPROTO_TCP,
             extensions: ExtensionFlags::empty(),
             states: StateFlags::all(),
             socket_id: SocketId::new_v4(),

netlink-packet-sock-diag/src/inet/socket_id.rs

@@ -114,7 +114,7 @@ impl Emitable for SocketId {
 
         let mut address_buf: [u8; 16] = [0; 16];
         match self.source_address {
-            IpAddr::V4(ip) => (&mut address_buf[0..4]).copy_from_slice(&ip.octets()[..]),
+            IpAddr::V4(ip) => address_buf[0..4].copy_from_slice(&ip.octets()[..]),
             IpAddr::V6(ip) => address_buf.copy_from_slice(&ip.octets()[..]),
         }
 
@@ -124,7 +124,7 @@ impl Emitable for SocketId {
 
         address_buf = [0; 16];
         match self.destination_address {
-            IpAddr::V4(ip) => (&mut address_buf[0..4]).copy_from_slice(&ip.octets()[..]),
+            IpAddr::V4(ip) => address_buf[0..4].copy_from_slice(&ip.octets()[..]),
             IpAddr::V6(ip) => address_buf.copy_from_slice(&ip.octets()[..]),
         }
 

netlink-packet-wireguard/src/raw.rs

@@ -86,10 +86,10 @@ pub fn parse_ip(payload: &[u8]) -> Result<IpAddr, DecodeError> {
 pub fn emit_ip(addr: &IpAddr, buf: &mut [u8]) {
     match addr {
         IpAddr::V4(ip) => {
-            (&mut buf[..IPV4_LEN]).copy_from_slice(ip.octets().as_slice());
+            buf[..IPV4_LEN].copy_from_slice(ip.octets().as_slice());
         }
         IpAddr::V6(ip) => {
-            (&mut buf[..IPV6_LEN]).copy_from_slice(ip.octets().as_slice());
+            buf[..IPV6_LEN].copy_from_slice(ip.octets().as_slice());
         }
     }
 }
@@ -112,9 +112,9 @@ pub fn emit_ip(addr: &IpAddr, buf: &mut [u8]) {
 fn emit_socket_addr_v4(addr: &SocketAddrV4, buf: &mut [u8]) {
     NativeEndian::write_u16(&mut buf[..2], AF_INET);
     BigEndian::write_u16(&mut buf[2..4], addr.port());
-    (&mut buf[4..8]).copy_from_slice(addr.ip().octets().as_slice());
+    buf[4..8].copy_from_slice(addr.ip().octets().as_slice());
     // padding
-    (&mut buf[8..16]).copy_from_slice([0; 8].as_slice());
+    buf[8..16].copy_from_slice([0; 8].as_slice());
 }
 
 /// Emit an IPv6 socket address.
@@ -137,7 +137,7 @@ fn emit_socket_addr_v6(addr: &SocketAddrV6, buf: &mut [u8]) {
     NativeEndian::write_u16(&mut buf[..2], AF_INET6);
     BigEndian::write_u16(&mut buf[2..4], addr.port());
     NativeEndian::write_u32(&mut buf[4..8], addr.flowinfo());
-    (&mut buf[8..24]).copy_from_slice(addr.ip().octets().as_slice());
+    buf[8..24].copy_from_slice(addr.ip().octets().as_slice());
     NativeEndian::write_u32(&mut buf[24..28], addr.scope_id());
 }
 
@@ -206,13 +206,13 @@ mod test {
 
     #[test]
     fn test_parse_socket_addr_in_1() {
-        let ipaddr = parse_socket_addr(&SOCKADDR_IN_BYTES_1).unwrap();
+        let ipaddr = parse_socket_addr(SOCKADDR_IN_BYTES_1).unwrap();
         assert_eq!(ipaddr, SocketAddrV4::new(Ipv4Addr::LOCALHOST, 7290).into());
     }
 
     #[test]
     fn test_parse_socket_addr_in_2() {
-        let ipaddr = parse_socket_addr(&SOCKADDR_IN_BYTES_2).unwrap();
+        let ipaddr = parse_socket_addr(SOCKADDR_IN_BYTES_2).unwrap();
         assert_eq!(
             ipaddr,
             SocketAddrV4::new(Ipv4Addr::new(192, 168, 1, 1), 51820).into()
@@ -221,7 +221,7 @@ mod test {
 
     #[test]
     fn test_parse_socket_addr_in6_1() {
-        let ipaddr = parse_socket_addr(&SOCKADDR_IN6_BYTES_1).unwrap();
+        let ipaddr = parse_socket_addr(SOCKADDR_IN6_BYTES_1).unwrap();
         assert_eq!(
             ipaddr,
             SocketAddrV6::new(

netlink-sys/examples/audit_events_tokio_manual_thread_builder.rs

@@ -17,5 +17,5 @@ fn main() -> Result<(), String> {
         TokioSocket::new(NETLINK_AUDIT).unwrap();
     };
     rt.handle().block_on(future);
-    return Ok(());
+    Ok(())
 }

rtnetlink/examples/get_links.rs

@@ -71,7 +71,7 @@ async fn get_link_by_index(handle: Handle, index: u32) -> Result<(), Error> {
 
 async fn get_link_by_name(handle: Handle, name: String) -> Result<(), Error> {
     let mut links = handle.link().get().match_name(name.clone()).execute();
-    if let Some(_) = links.try_next().await? {
+    if (links.try_next().await?).is_some() {
         println!("found link {}", name);
         // We should only have one link with that name
         assert!(links.try_next().await?.is_none());

rtnetlink/examples/get_links_async.rs

@@ -71,7 +71,7 @@ async fn get_link_by_index(handle: Handle, index: u32) -> Result<(), Error> {
 
 async fn get_link_by_name(handle: Handle, name: String) -> Result<(), Error> {
     let mut links = handle.link().get().match_name(name.clone()).execute();
-    if let Some(_) = links.try_next().await? {
+    if (links.try_next().await?).is_some() {
         println!("found link {}", name);
         // We should only have one link with that name
         assert!(links.try_next().await?.is_none());

rtnetlink/examples/get_links_thread_builder.rs

@@ -71,7 +71,7 @@ async fn get_link_by_index(handle: Handle, index: u32) -> Result<(), Error> {
 
 async fn get_link_by_name(handle: Handle, name: String) -> Result<(), Error> {
     let mut links = handle.link().get().match_name(name.clone()).execute();
-    if let Some(_) = links.try_next().await? {
+    if (links.try_next().await?).is_some() {
         println!("found link {}", name);
         // We should only have one link with that name
         assert!(links.try_next().await?.is_none());
@@ -124,5 +124,5 @@ fn main() -> Result<(), String> {
     let future = do_it(&rt);
     println!("blocking in main");
     rt.handle().block_on(future).unwrap();
-    return Ok(());
+    Ok(())
 }

rtnetlink/examples/property_altname.rs

@@ -29,15 +29,13 @@ async fn main() -> Result<(), ()> {
 
     match action.as_str() {
         "add" => {
-            if let Err(e) = add_property_alt_ifnames(link_name, &alt_ifnames, handle.clone()).await
-            {
+            if let Err(e) = add_property_alt_ifnames(link_name, alt_ifnames, handle.clone()).await {
                 eprintln!("{}", e);
             }
         }
 
         "del" => {
-            if let Err(e) = del_property_alt_ifnames(link_name, &alt_ifnames, handle.clone()).await
-            {
+            if let Err(e) = del_property_alt_ifnames(link_name, alt_ifnames, handle.clone()).await {
                 eprintln!("{}", e);
             }
         }
@@ -112,7 +110,7 @@ async fn get_link(link_name: &str, handle: Handle) -> Result<LinkMessage, Error>
     match links.try_next().await? {
         Some(msg) => Ok(msg),
         _ => {
-            eprintln!("Interface {} not found", link_name.to_string());
+            eprintln!("Interface {} not found", link_name);
             Err(Error::RequestFailed)
         }
     }

rtnetlink/src/link/test.rs

@@ -51,7 +51,7 @@ async fn _create_wg() -> Result<LinkHandle, Error> {
 async fn _get_wg(handle: &mut LinkHandle) -> Result<LinkMessage, Error> {
     let mut links = handle.get().match_name(IFACE_NAME.to_owned()).execute();
     let msg = links.try_next().await?;
-    msg.ok_or_else(|| Error::RequestFailed)
+    msg.ok_or(Error::RequestFailed)
 }
 
 async fn _del_wg(handle: &mut LinkHandle, index: u32) -> Result<(), Error> {

rtnetlink/src/traffic_control/test.rs

@@ -185,27 +185,33 @@ fn _remove_test_tclass_from_dummy() {
             "1:1",
         ])
         .status()
-        .expect(&format!(
-            "failed to remove tclass from dummy interface {}",
-            TEST_DUMMY_NIC
-        ));
+        .unwrap_or_else(|_| {
+            panic!(
+                "failed to remove tclass from dummy interface {}",
+                TEST_DUMMY_NIC
+            )
+        });
     Command::new("tc")
         .args(&["qdisc", "del", "dev", TEST_DUMMY_NIC, "root"])
         .status()
-        .expect(&format!(
-            "failed to remove qdisc from dummy interface {}",
-            TEST_DUMMY_NIC
-        ));
+        .unwrap_or_else(|_| {
+            panic!(
+                "failed to remove qdisc from dummy interface {}",
+                TEST_DUMMY_NIC
+            )
+        });
 }
 
 fn _remove_test_filter_from_dummy() {
     Command::new("tc")
         .args(&["filter", "del", "dev", TEST_DUMMY_NIC])
         .status()
-        .expect(&format!(
-            "failed to remove filter from dummy interface {}",
-            TEST_DUMMY_NIC
-        ));
+        .unwrap_or_else(|_| {
+            panic!(
+                "failed to remove filter from dummy interface {}",
+                TEST_DUMMY_NIC
+            )
+        });
 }
 
 async fn _get_filters(ifindex: i32) -> Vec<TcMessage> {