lint fixes

Author: Maciej Wójcik

examples/client.rs

@@ -1,7 +1,7 @@
 use std::{net::SocketAddr, str::FromStr};
 
 use defguard_wireguard_rs::{
-    host::Peer, key::Key, net::IpAddrMask, InterfaceConfiguration, Kernel, Userspace, WGApi,
+    host::Peer, key::Key, net::IpAddrMask, InterfaceConfiguration, Kernel, WGApi,
     WireguardInterfaceApi,
 };
 use x25519_dalek::{EphemeralSecret, PublicKey};

examples/server.rs

@@ -1,7 +1,7 @@
 use std::str::FromStr;
 
 use defguard_wireguard_rs::{
-    host::Peer, key::Key, net::IpAddrMask, InterfaceConfiguration, Kernel, Userspace, WGApi,
+    host::Peer, key::Key, net::IpAddrMask, InterfaceConfiguration, Kernel, WGApi,
     WireguardInterfaceApi,
 };
 use x25519_dalek::{EphemeralSecret, PublicKey};

examples/userspace.rs

@@ -1,14 +1,10 @@
-use std::{
-    io::{stdin, stdout, Read, Write},
-    net::SocketAddr,
-    str::FromStr,
-};
+#[cfg(target_os = "macos")]
+use std::io::{stdin, stdout, Read, Write};
 
-use defguard_wireguard_rs::{host::Peer, key::Key, net::IpAddrMask, InterfaceConfiguration};
 #[cfg(target_os = "macos")]
 use defguard_wireguard_rs::{Userspace, WGApi, WireguardInterfaceApi};
-use x25519_dalek::{EphemeralSecret, PublicKey};
 
+#[cfg(target_os = "macos")]
 fn pause() {
     let mut stdout = stdout();
     stdout.write_all(b"Press Enter to continue...").unwrap();

src/netlink.rs

@@ -467,6 +467,7 @@ fn get_interface_index(ifname: &str) -> NetlinkResult<Option<u32>> {
     Ok(None)
 }
 
+#[cfg(test)]
 /// Get default route for a given address family.
 pub(crate) fn get_gateway(address_family: AddressFamily) -> NetlinkResult<Option<IpAddr>> {
     let header = RouteHeader {
@@ -493,16 +494,13 @@ pub(crate) fn get_gateway(address_family: AddressFamily) -> NetlinkResult<Option
             // Because messages can't be properly filtered, find the first `Gateway`.
             if let RouteNetlinkMessage::NewRoute(RouteMessage { attributes, .. }) = message {
                 for nla in attributes {
-                    match nla {
-                        RouteAttribute::Gateway(address) => {
-                            debug!("Found gateway {address:?}");
-                            match address {
-                                RouteAddress::Inet(ipv4) => return Ok(Some(IpAddr::V4(ipv4))),
-                                RouteAddress::Inet6(ipv6) => return Ok(Some(IpAddr::V6(ipv6))),
-                                _ => (),
-                            }
+                    if let RouteAttribute::Gateway(address) = nla {
+                        debug!("Found gateway {address:?}");
+                        match address {
+                            RouteAddress::Inet(ipv4) => return Ok(Some(IpAddr::V4(ipv4))),
+                            RouteAddress::Inet6(ipv6) => return Ok(Some(IpAddr::V6(ipv6))),
+                            _ => (),
                         }
-                        _ => (),
                     }
                 }
             }

src/wgapi_linux.rs

@@ -53,7 +53,7 @@ impl WireguardInterfaceApi for WGApi<Kernel> {
         // Assign IP addresses to the interface.
         for address in &config.addresses {
             debug!("Assigning address {address} to interface {}", self.ifname);
-            self.assign_address(&address)?;
+            self.assign_address(address)?;
             debug!(
                 "Address {address} assigned to interface {} successfully",
                 self.ifname
@@ -102,9 +102,9 @@ impl WireguardInterfaceApi for WGApi<Kernel> {
     /// If allowed IPs contain a default route, instead of adding a route for every peer, the following changes are made:
     /// - A new default route is added
     /// - The current default route is suppressed by modifying the main routing table rule with `suppress_prefixlen 0`, this makes
-    ///     it so that the whole main routing table rules are still applied except for the default route rules (so the new default route is used instead)
+    ///   it so that the whole main routing table rules are still applied except for the default route rules (so the new default route is used instead)
     /// - A rule pushing all traffic through the WireGuard interface is added with the exception of traffic marked with 51820 (default) fwmark which
-    ///    is used for the WireGuard traffic itself (so it doesn't get stuck in a loop)
+    ///   is used for the WireGuard traffic itself (so it doesn't get stuck in a loop)
     ///
     fn configure_peer_routing(&self, peers: &[Peer]) -> Result<(), WireguardInterfaceError> {
         add_peer_routing(peers, &self.ifname)?;