Fix cargo clippy

Signed-off-by: Gris Ge <fge@redhat.com>

src/address/attribute.rs

@@ -60,7 +60,7 @@ impl Nla for AddressAttribute {
                     IPV4_ADDR_LEN
                 }
             }
-            Self::Label(ref string) => string.as_bytes().len() + 1,
+            Self::Label(ref string) => string.len() + 1,
 
             Self::Flags(_) => size_of::<u32>(),
 

src/lib.rs

@@ -1,5 +1,27 @@
 // SPDX-License-Identifier: MIT
 
+//! The `netlink-packet-route` crate is designed to abstract Netlink route
+//! protocol(`rtnetlink`) packet into Rust data types. The goal of this crate is
+//! saving netlink user from reading Kernel Netlink codes.
+//!
+//! This crate grouped Netlink route protocol into these modules:
+//!  * `link`: NIC interface, similar to to `ip link` command.
+//!  * `address`: IP address, similar to `ip address` command.
+//!  * `route`: Route, similar to `ip route` command.
+//!  * `rule`: Route rule, similar to `ip rule` command.
+//!  * `tc`: Traffic control, similar to `tc` command.
+//!  * `neighbour`: Neighbour, similar to `ip neighbour` command.
+//!  * `neighbour_table`: Neighbour table, similar to `ip ntable` command.
+//!  * `nsid`: Namespace, similar to `ip netns` command.
+//!
+//! At the top level of this crate, we also provide:
+//!  * [AddressFamily]
+//!
+//! Normally, you should use [`rtnetlink`][rtnetlink_url] instead of using this
+//! crate directly.
+//!
+//! [rtnetlink_url]: https://docs.rs/rtnetlink
+
 pub mod address;
 pub mod link;
 pub mod neighbour;
@@ -42,28 +64,6 @@ pub use self::address_family_fallback::AddressFamily;
 pub use self::ip::IpProtocol;
 pub use self::message::{RouteNetlinkMessage, RouteNetlinkMessageBuffer};
 
-/// The `netlink-packet-route` crate is designed to abstract Netlink route
-/// protocol(`rtnetlink`) packet into Rust data types. The goal of this crate is
-/// saving netlink user from reading Kernel Netlink codes.
-///
-/// This crate grouped Netlink route protocol into these modules:
-///  * `link`: NIC interface, similar to to `ip link` command.
-///  * `address`: IP address, similar to `ip address` command.
-///  * `route`: Route, similar to `ip route` command.
-///  * `rule`: Route rule, similar to `ip rule` command.
-///  * `tc`: Traffic control, similar to `tc` command.
-///  * `neighbour`: Neighbour, similar to `ip neighbour` command.
-///  * `neighbour_table`: Neighbour table, similar to `ip ntable` command.
-///  * `nsid`: Namespace, similar to `ip netns` command.
-///
-/// At the top level of this crate, we also provide:
-///  * [AddressFamily]
-///
-/// Normally, you should use [`rtnetlink`][rtnetlink_url] instead of using this
-/// crate directly.
-///
-/// [rtnetlink_url]: https://docs.rs/rtnetlink
-
 #[macro_use]
 extern crate netlink_packet_utils;
 

src/link/attribute.rs

@@ -188,7 +188,7 @@ impl Nla for LinkAttribute {
             Self::IfName(string)
             | Self::Qdisc(string)
             | Self::IfAlias(string)
-            | Self::PhysPortName(string) => string.as_bytes().len() + 1,
+            | Self::PhysPortName(string) => string.len() + 1,
 
             Self::Mode(_) | Self::Carrier(_) | Self::ProtoDown(_) => 1,
 

src/link/prop_list.rs

@@ -22,7 +22,7 @@ impl Nla for Prop {
     fn value_len(&self) -> usize {
         use self::Prop::*;
         match self {
-            AltIfName(ref string) => string.as_bytes().len() + 1,
+            AltIfName(ref string) => string.len() + 1,
             Other(nla) => nla.value_len()
         }
     }

src/link/sriov/broadcast.rs

@@ -26,7 +26,7 @@ buffer!(VfInfoBroadcastBuffer(VF_INFO_BROADCAST_LEN) {
     addr: (slice, 0..VF_INFO_BROADCAST_LEN),
 });
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<VfInfoBroadcastBuffer<&'a T>>
+impl<T: AsRef<[u8]> + ?Sized> Parseable<VfInfoBroadcastBuffer<&T>>
     for VfInfoBroadcast
 {
     fn parse(buf: &VfInfoBroadcastBuffer<&T>) -> Result<Self, DecodeError> {

src/link/sriov/guid.rs

@@ -22,9 +22,7 @@ buffer!(VfInfoGuidBuffer(VF_INFO_GUID_LEN) {
     guid: (u64, 4..12),
 });
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<VfInfoGuidBuffer<&'a T>>
-    for VfInfoGuid
-{
+impl<T: AsRef<[u8]> + ?Sized> Parseable<VfInfoGuidBuffer<&T>> for VfInfoGuid {
     fn parse(buf: &VfInfoGuidBuffer<&T>) -> Result<Self, DecodeError> {
         Ok(Self::new(buf.vf_id(), buf.guid()))
     }

src/link/sriov/link_state.rs

@@ -22,7 +22,7 @@ buffer!(VfInfoLinkStateBuffer(VF_INFO_LINK_STATE_LEN) {
     state: (u32, 4..8),
 });
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<VfInfoLinkStateBuffer<&'a T>>
+impl<T: AsRef<[u8]> + ?Sized> Parseable<VfInfoLinkStateBuffer<&T>>
     for VfInfoLinkState
 {
     fn parse(buf: &VfInfoLinkStateBuffer<&T>) -> Result<Self, DecodeError> {

src/link/sriov/mac.rs

@@ -33,9 +33,7 @@ buffer!(VfInfoMacBuffer(VF_INFO_MAC_LEN) {
     mac: (slice, 4..VF_INFO_MAC_LEN),
 });
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<VfInfoMacBuffer<&'a T>>
-    for VfInfoMac
-{
+impl<T: AsRef<[u8]> + ?Sized> Parseable<VfInfoMacBuffer<&T>> for VfInfoMac {
     fn parse(buf: &VfInfoMacBuffer<&T>) -> Result<Self, DecodeError> {
         Ok(Self::new(buf.vf_id(), buf.mac()))
     }

src/link/sriov/rate.rs

@@ -28,9 +28,7 @@ buffer!(VfInfoRateBuffer(VF_INFO_RATE_LEN) {
     max_tx_rate: (u32, 8..12)
 });
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<VfInfoRateBuffer<&'a T>>
-    for VfInfoRate
-{
+impl<T: AsRef<[u8]> + ?Sized> Parseable<VfInfoRateBuffer<&T>> for VfInfoRate {
     fn parse(buf: &VfInfoRateBuffer<&T>) -> Result<Self, DecodeError> {
         Ok(Self {
             vf_id: buf.vf_id(),

src/link/sriov/rss_query.rs

@@ -22,7 +22,7 @@ buffer!(VfInfoRssQueryEnBuffer(VF_INFO_RSS_QUERY_EN_LEN) {
     setting: (u32, 4..8),
 });
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<VfInfoRssQueryEnBuffer<&'a T>>
+impl<T: AsRef<[u8]> + ?Sized> Parseable<VfInfoRssQueryEnBuffer<&T>>
     for VfInfoRssQueryEn
 {
     fn parse(buf: &VfInfoRssQueryEnBuffer<&T>) -> Result<Self, DecodeError> {

src/link/sriov/spoofchk.rs

@@ -22,7 +22,7 @@ buffer!(VfInfoSpoofCheckBuffer(VF_INFO_SPOOFCHK_LEN) {
     setting: (u32, 4..8),
 });
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<VfInfoSpoofCheckBuffer<&'a T>>
+impl<T: AsRef<[u8]> + ?Sized> Parseable<VfInfoSpoofCheckBuffer<&T>>
     for VfInfoSpoofCheck
 {
     fn parse(buf: &VfInfoSpoofCheckBuffer<&T>) -> Result<Self, DecodeError> {

src/link/sriov/trust.rs

@@ -22,9 +22,7 @@ buffer!(VfInfoTrustBuffer(VF_INFO_TRUST_LEN) {
     setting: (u32, 4..8),
 });
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<VfInfoTrustBuffer<&'a T>>
-    for VfInfoTrust
-{
+impl<T: AsRef<[u8]> + ?Sized> Parseable<VfInfoTrustBuffer<&T>> for VfInfoTrust {
     fn parse(buf: &VfInfoTrustBuffer<&T>) -> Result<Self, DecodeError> {
         Ok(Self::new(
             buf.vf_id(),

src/link/sriov/tx_rate.rs

@@ -22,7 +22,7 @@ buffer!(VfInfoTxRateBuffer(VF_INFO_TX_RATE_LEN) {
     rate: (u32, 4..8),
 });
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<VfInfoTxRateBuffer<&'a T>>
+impl<T: AsRef<[u8]> + ?Sized> Parseable<VfInfoTxRateBuffer<&T>>
     for VfInfoTxRate
 {
     fn parse(buf: &VfInfoTxRateBuffer<&T>) -> Result<Self, DecodeError> {

src/link/sriov/vf_vlan.rs

@@ -90,9 +90,7 @@ buffer!(VfVlanInfoBuffer(VF_VLAN_INFO_LEN) {
     protocol: (u16, 12..14),
 });
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<VfVlanInfoBuffer<&'a T>>
-    for VfVlanInfo
-{
+impl<T: AsRef<[u8]> + ?Sized> Parseable<VfVlanInfoBuffer<&T>> for VfVlanInfo {
     fn parse(buf: &VfVlanInfoBuffer<&T>) -> Result<Self, DecodeError> {
         Ok(Self {
             vf_id: buf.vf_id(),

src/link/sriov/vlan.rs

@@ -28,9 +28,7 @@ buffer!(VfInfoVlanBuffer(VF_INFO_VLAN_LEN) {
     qos: (u32, 8..12)
 });
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<VfInfoVlanBuffer<&'a T>>
-    for VfInfoVlan
-{
+impl<T: AsRef<[u8]> + ?Sized> Parseable<VfInfoVlanBuffer<&T>> for VfInfoVlan {
     fn parse(buf: &VfInfoVlanBuffer<&T>) -> Result<Self, DecodeError> {
         Ok(Self {
             vf_id: buf.vf_id(),

src/route/mpls.rs

@@ -138,10 +138,10 @@ impl From<u32> for MplsLabel {
 
 impl From<MplsLabel> for u32 {
     fn from(v: MplsLabel) -> u32 {
-        v.label << MPLS_LS_LABEL_SHIFT
-            | (v.traffic_class as u32) << MPLS_LS_TC_SHIFT
-            | (v.bottom_of_stack as u32) << MPLS_LS_S_SHIFT
-            | (v.ttl as u32) << MPLS_LS_TTL_SHIFT
+        (v.label << MPLS_LS_LABEL_SHIFT)
+            | ((v.traffic_class as u32) << MPLS_LS_TC_SHIFT)
+            | ((v.bottom_of_stack as u32) << MPLS_LS_S_SHIFT)
+            | ((v.ttl as u32) << MPLS_LS_TTL_SHIFT)
     }
 }
 

src/route/next_hops.rs

@@ -94,9 +94,9 @@ pub struct RouteNextHop {
     pub attributes: Vec<RouteAttribute>,
 }
 
-impl<'a, T: AsRef<[u8]>>
+impl<T: AsRef<[u8]>>
     ParseableParametrized<
-        RouteNextHopBuffer<&'a T>,
+        RouteNextHopBuffer<&T>,
         (AddressFamily, RouteType, RouteLwEnCapType),
     > for RouteNextHop
 {

src/route/realm.rs

@@ -34,7 +34,7 @@ impl Emitable for RouteRealm {
     }
 
     fn emit(&self, buffer: &mut [u8]) {
-        let all = (self.source as u32) << 16 | self.destination as u32;
+        let all = ((self.source as u32) << 16) | self.destination as u32;
         buffer.copy_from_slice(&all.to_ne_bytes());
     }
 }

src/rule/attribute.rs

@@ -80,7 +80,7 @@ impl Nla for RuleAttribute {
             Self::SourcePortRange(v) | Self::DestinationPortRange(v) => {
                 v.buffer_len()
             }
-            Self::Iifname(s) | Self::Oifname(s) => s.as_bytes().len() + 1,
+            Self::Iifname(s) | Self::Oifname(s) => s.len() + 1,
             Self::Priority(_)
             | Self::FwMark(_)
             | Self::FwMask(_)

src/tc/actions/action.rs

@@ -192,9 +192,8 @@ impl Nla for TcActionAttribute {
         match self {
             Self::Cookie(bytes) => buffer.copy_from_slice(bytes.as_slice()),
             Self::Kind(string) => {
-                buffer[..string.as_bytes().len()]
-                    .copy_from_slice(string.as_bytes());
-                buffer[string.as_bytes().len()] = 0;
+                buffer[..string.len()].copy_from_slice(string.as_bytes());
+                buffer[string.len()] = 0;
             }
             Self::Options(opt) => opt.as_slice().emit(buffer),
             Self::Index(value) | Self::InHwCount(value) => {
@@ -580,7 +579,7 @@ buffer!(TcfBuffer(TC_TCF_BUF_LEN) {
     firstuse: (u64, 24..32),
 });
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<TcfBuffer<&'a T>> for Tcf {
+impl<T: AsRef<[u8]> + ?Sized> Parseable<TcfBuffer<&T>> for Tcf {
     fn parse(buf: &TcfBuffer<&T>) -> Result<Self, DecodeError> {
         Ok(Self {
             install: buf.install(),

src/tc/actions/mirror.rs

@@ -116,9 +116,7 @@ impl Emitable for TcMirror {
     }
 }
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<TcMirrorBuffer<&'a T>>
-    for TcMirror
-{
+impl<T: AsRef<[u8]> + ?Sized> Parseable<TcMirrorBuffer<&T>> for TcMirror {
     fn parse(buf: &TcMirrorBuffer<&T>) -> Result<Self, DecodeError> {
         Ok(Self {
             generic: TcActionGeneric::parse(&TcActionGenericBuffer::new(

src/tc/actions/nat.rs

@@ -139,7 +139,7 @@ impl Emitable for TcNat {
     }
 }
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<TcNatBuffer<&'a T>> for TcNat {
+impl<T: AsRef<[u8]> + ?Sized> Parseable<TcNatBuffer<&T>> for TcNat {
     fn parse(buf: &TcNatBuffer<&T>) -> Result<Self, DecodeError> {
         Ok(Self {
             generic: TcActionGeneric::parse(&TcActionGenericBuffer::new(

src/tc/actions/tunnel_key.rs

@@ -189,9 +189,7 @@ impl Emitable for TcTunnelKey {
     }
 }
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<TcTunnelKeyBuffer<&'a T>>
-    for TcTunnelKey
-{
+impl<T: AsRef<[u8]> + ?Sized> Parseable<TcTunnelKeyBuffer<&T>> for TcTunnelKey {
     fn parse(buf: &TcTunnelKeyBuffer<&T>) -> Result<Self, DecodeError> {
         Ok(Self {
             generic: TcActionGeneric::parse(&TcActionGenericBuffer::new(

src/tc/attribute.rs

@@ -60,7 +60,7 @@ impl Nla for TcAttribute {
             Self::HwOffload(_) => 1,
             Self::Stats2(ref v) => v.as_slice().buffer_len(),
             Self::Stats(ref v) => v.buffer_len(),
-            Self::Kind(ref string) => string.as_bytes().len() + 1,
+            Self::Kind(ref string) => string.len() + 1,
             Self::Options(ref opt) => opt.as_slice().buffer_len(),
             Self::DumpInvisible(_) => 0, // The existence of NLA means true
             Self::Other(ref attr) => attr.value_len(),
@@ -78,9 +78,8 @@ impl Nla for TcAttribute {
             Self::Stats2(ref stats) => stats.as_slice().emit(buffer),
             Self::Stats(ref stats) => stats.emit(buffer),
             Self::Kind(ref string) => {
-                buffer[..string.as_bytes().len()]
-                    .copy_from_slice(string.as_bytes());
-                buffer[string.as_bytes().len()] = 0;
+                buffer[..string.len()].copy_from_slice(string.as_bytes());
+                buffer[string.len()] = 0;
             }
             Self::Options(ref opt) => opt.as_slice().emit(buffer),
             Self::DumpInvisible(_) => (),