Fix some more clippy warnings from rust nightly.

Author: zooknotic

src/address.rs

@@ -60,8 +60,8 @@ impl Address {
 
     pub fn from_ip(ip: &IpAddr) -> Address {
         match ip {
-            IpAddr::V4(v4) => Self::from_ipv4(&v4),
-            IpAddr::V6(v6) => Self::from_ipv6(&v6),
+            IpAddr::V4(v4) => Self::from_ipv4(v4),
+            IpAddr::V6(v6) => Self::from_ipv6(v6),
         }
     }
 }

src/lib.rs

@@ -7,10 +7,10 @@ pub mod async_event_id;
 pub use async_event_id::*;
 
 mod buffer;
-pub use self::buffer::*;
+pub use buffer::*;
 
 pub mod constants;
-pub use self::constants::*;
+pub use constants::*;
 
 pub mod id;
 pub use id::*;
@@ -19,22 +19,20 @@ pub mod lifetime;
 pub use lifetime::*;
 
 mod message;
-pub use self::message::*;
+pub use message::*;
 
 pub mod monitor;
 pub use monitor::*;
 
 pub mod nlas;
-pub use self::nlas::*;
+pub use nlas::*;
 
 pub mod policy;
-pub use self::policy::*;
 
 pub mod selector;
 pub use selector::*;
 
 pub mod state;
-pub use state::*;
 
 pub mod stats;
 pub use stats::*;

src/nlas/address_filter.rs

@@ -89,7 +89,7 @@ impl AddressFilter {
         } else {
             self.splen = prefixlen;
         }
-        self.family(&addr);
+        self.family(addr);
     }
 
     pub fn destination_prefix(&mut self, addr: &IpAddr, prefixlen: u8) {
@@ -100,6 +100,6 @@ impl AddressFilter {
         } else {
             self.dplen = prefixlen;
         }
-        self.family(&addr);
+        self.family(addr);
     }
 }

src/nlas/mod.rs

@@ -179,14 +179,10 @@ impl Nla for XfrmAttrs {
                 let mut it_tmpl = v.iter();
                 let mut it_buf =
                     buffer.chunks_exact_mut(XFRM_USER_TEMPLATE_LEN);
-                loop {
-                    if let (Some(tmpl), Some(buf)) =
-                        (it_tmpl.next(), it_buf.next())
-                    {
-                        tmpl.emit(buf);
-                    } else {
-                        break;
-                    }
+                while let (Some(tmpl), Some(buf)) =
+                    (it_tmpl.next(), it_buf.next())
+                {
+                    tmpl.emit(buf);
                 }
             }
             TfcPadding(ref v) => NativeEndian::write_u32(buffer, *v),

src/nlas/user_template.rs

@@ -130,7 +130,7 @@ impl UserTemplate {
     /// should be the same type.
     pub fn source(&mut self, addr: &IpAddr) {
         self.saddr = Address::from_ip(addr);
-        self.family(&addr);
+        self.family(addr);
     }
 
     /// Sets the destination address. Automatically sets the
@@ -139,7 +139,7 @@ impl UserTemplate {
     /// should be the same type.
     pub fn destination(&mut self, addr: &IpAddr) {
         self.id.daddr = Address::from_ip(addr);
-        self.family(&addr);
+        self.family(addr);
     }
 
     /// Sets the transform protocol. Should be one of:

src/policy/default/message.rs

@@ -2,10 +2,8 @@
 
 use anyhow::Context;
 
-use crate::{
-    DefaultMessageBuffer, UserPolicyDefault, UserPolicyDefaultBuffer,
-    POLICY_DEFAULT_HEADER_LEN,
-};
+use crate::policy::{DefaultMessageBuffer, POLICY_DEFAULT_HEADER_LEN};
+use crate::{UserPolicyDefault, UserPolicyDefaultBuffer};
 
 use netlink_packet_utils::{traits::*, DecodeError};
 

src/policy/spdinfo/message.rs

@@ -2,7 +2,7 @@
 
 use anyhow::Context;
 
-use crate::{
+use crate::policy::{
     GetSpdInfoMessageBuffer, NewSpdInfoMessageBuffer, SpdInfoAttrs,
     POLICY_GET_SPD_INFO_HEADER_LEN, POLICY_NEW_SPD_INFO_HEADER_LEN,
 };

src/selector.rs

@@ -124,7 +124,7 @@ impl Selector {
         } else {
             self.prefixlen_s = prefixlen;
         }
-        self.family(&addr);
+        self.family(addr);
     }
 
     pub fn destination_prefix(&mut self, addr: &IpAddr, prefixlen: u8) {
@@ -135,6 +135,6 @@ impl Selector {
         } else {
             self.prefixlen_d = prefixlen;
         }
-        self.family(&addr);
+        self.family(addr);
     }
 }

src/state/allocspi/message.rs

@@ -2,7 +2,8 @@
 
 use anyhow::Context;
 
-use crate::{AllocSpiMessageBuffer, UserSpiInfo, UserSpiInfoBuffer, XfrmAttrs};
+use crate::state::AllocSpiMessageBuffer;
+use crate::{UserSpiInfo, UserSpiInfoBuffer, XfrmAttrs};
 
 use netlink_packet_utils::{traits::*, DecodeError};
 

src/state/flush/message.rs

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-use crate::{state::FlushMessageBuffer, STATE_FLUSH_HEADER_LEN};
+use crate::state::{FlushMessageBuffer, STATE_FLUSH_HEADER_LEN};
 
 use netlink_packet_utils::{traits::*, DecodeError};