From f232514982d1d7b48bd4ae263c2691b5d1163b9e Mon Sep 17 00:00:00 2001 From: Renato Westphal Date: Thu, 30 Jan 2025 21:30:47 -0300 Subject: [PATCH] chore: fix new clippy warnings from nightly Signed-off-by: Renato Westphal --- holo-bgp/src/packet/message.rs | 2 +- holo-isis/src/interface.rs | 2 +- holo-isis/src/packet/tlv.rs | 2 +- holo-ldp/src/packet/messages/label.rs | 2 +- holo-ospf/src/ospfv3/packet/lsa.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/holo-bgp/src/packet/message.rs b/holo-bgp/src/packet/message.rs index 8b0395f9..0ce7ea11 100644 --- a/holo-bgp/src/packet/message.rs +++ b/holo-bgp/src/packet/message.rs @@ -1061,5 +1061,5 @@ pub(crate) fn decode_ipv6_prefix( // Calculates the number of bytes required to encode a prefix. fn prefix_wire_len(len: u8) -> usize { - (len as usize + 7) / 8 + (len as usize).div_ceil(8) } diff --git a/holo-isis/src/interface.rs b/holo-isis/src/interface.rs index ef00002a..cc5a9645 100644 --- a/holo-isis/src/interface.rs +++ b/holo-isis/src/interface.rs @@ -441,7 +441,7 @@ impl Interface { } pub(crate) fn is_dis(&self, level: LevelNumber) -> bool { - self.state.dis.get(level).map_or(false, |dis| dis.myself) + self.state.dis.get(level).is_some_and(|dis| dis.myself) } pub(crate) fn dis_start(&mut self, instance: &mut InstanceUpView<'_>) { diff --git a/holo-isis/src/packet/tlv.rs b/holo-isis/src/packet/tlv.rs index 76ffe0e0..bbd02bd6 100644 --- a/holo-isis/src/packet/tlv.rs +++ b/holo-isis/src/packet/tlv.rs @@ -1346,7 +1346,7 @@ impl Tlv for T { // Calculates the number of bytes required to encode a prefix. const fn prefix_wire_len(len: u8) -> usize { - (len as usize + 7) / 8 + (len as usize).div_ceil(8) } fn tlv_encode_start(buf: &mut BytesMut, tlv_type: impl ToPrimitive) -> usize { diff --git a/holo-ldp/src/packet/messages/label.rs b/holo-ldp/src/packet/messages/label.rs index 4afa0d37..7de9d98b 100644 --- a/holo-ldp/src/packet/messages/label.rs +++ b/holo-ldp/src/packet/messages/label.rs @@ -644,5 +644,5 @@ impl TlvKind for TlvLabelRequestId { // Calculate the number of bytes required to encode a prefix. fn prefix_wire_len(len: u8) -> usize { - (len as usize + 7) / 8 + (len as usize).div_ceil(8) } diff --git a/holo-ospf/src/ospfv3/packet/lsa.rs b/holo-ospf/src/ospfv3/packet/lsa.rs index 5eb0ad33..c6a83dff 100644 --- a/holo-ospf/src/ospfv3/packet/lsa.rs +++ b/holo-ospf/src/ospfv3/packet/lsa.rs @@ -2880,7 +2880,7 @@ impl LsaVersion for Ospfv3 { // Calculate the number of bytes required to encode a prefix. fn prefix_wire_len(len: u8) -> usize { - ((len as usize + 31) / 32) * 4 + (len as usize).div_ceil(32) * 4 } fn decode_16bit_addr(af: AddressFamily, buf: &mut Bytes) -> IpAddr {