Skip to content

Commit a55ede9

Browse files
committed
Fix cargo clippy.
1 parent af4277d commit a55ede9

File tree

2 files changed

+38
-33
lines changed

2 files changed

+38
-33
lines changed

src/route/seg6.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ bitflags! {
7878
#[derive(Clone, Eq, PartialEq, Debug, Copy, Default)]
7979
#[non_exhaustive]
8080
pub struct SrhFlags: u8 {
81-
const Protected = SR6_FLAG1_PROTECTED as u8;
82-
const Oam = SR6_FLAG1_OAM as u8;
83-
const Alert = SR6_FLAG1_ALERT as u8;
84-
const Hmac = SR6_FLAG1_HMAC as u8;
81+
const Protected = SR6_FLAG1_PROTECTED;
82+
const Oam = SR6_FLAG1_OAM;
83+
const Alert = SR6_FLAG1_ALERT;
84+
const Hmac = SR6_FLAG1_HMAC;
8585
const _ = !0;
8686
}
8787
}
@@ -191,7 +191,7 @@ impl Ipv6SrHdr {
191191
(_, segments) = segments.split_at(16usize);
192192
}
193193

194-
if payload.len() > 0 {
194+
if !payload.is_empty() {
195195
// Type and length.
196196
if payload.len() < 4 {
197197
return Err(DecodeError::from(format!(

src/route/seg6local.rs

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -283,20 +283,22 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
283283
Ok(match buf.kind() {
284284
SEG6_LOCAL_CNT_UNSPEC => Self::Unspec,
285285
SEG6_LOCAL_CNT_PAD => Self::Padding(payload.len()),
286-
SEG6_LOCAL_CNT_PACKETS => {
287-
Self::Packets(parse_u64(payload).context("")?)
288-
}
289-
SEG6_LOCAL_CNT_BYTES => {
290-
Self::Bytes(parse_u64(payload).context("")?)
291-
}
292-
SEG6_LOCAL_CNT_ERRORS => {
293-
Self::Errors(parse_u64(payload).context("")?)
294-
}
295-
_ => {
296-
Self::Other(DefaultNla::parse(buf).context(format!(
297-
"invalid NLA value (unknown type) value"
298-
))?)
299-
}
286+
SEG6_LOCAL_CNT_PACKETS => Self::Packets(
287+
parse_u64(payload)
288+
.context("invalid SEG6_LOCAL_CNT_PACKETS value")?,
289+
),
290+
SEG6_LOCAL_CNT_BYTES => Self::Bytes(
291+
parse_u64(payload)
292+
.context("invalid SEG6_LOCAL_CNT_BYTES value")?,
293+
),
294+
SEG6_LOCAL_CNT_ERRORS => Self::Errors(
295+
parse_u64(payload)
296+
.context("invalid SEG6_LOCAL_CNT_ERRORS value")?,
297+
),
298+
_ => Self::Other(
299+
DefaultNla::parse(buf)
300+
.context("invalid NLA value (unknown type) value")?,
301+
),
300302
})
301303
}
302304
}
@@ -355,20 +357,23 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
355357
fn parse(buf: &NlaBuffer<&'a T>) -> Result<Self, DecodeError> {
356358
let payload = buf.value();
357359
Ok(match buf.kind() {
358-
SEG6_LOCAL_FLV_OPERATION => {
359-
Self::Operation(parse_u32(payload).context("")?.into())
360-
}
361-
SEG6_LOCAL_FLV_LCBLOCK_BITS => {
362-
Self::Lblen(parse_u8(payload).context("")?)
363-
}
364-
SEG6_LOCAL_FLV_LCNODE_FN_BITS => {
365-
Self::Nflen(parse_u8(payload).context("")?)
366-
}
367-
_ => {
368-
Self::Other(DefaultNla::parse(buf).context(format!(
369-
"invalid NLA value (unknown type) value"
370-
))?)
371-
}
360+
SEG6_LOCAL_FLV_OPERATION => Self::Operation(
361+
parse_u32(payload)
362+
.context("invalid SEG6_LOCAL_FLV_OPERATION value")?
363+
.into(),
364+
),
365+
SEG6_LOCAL_FLV_LCBLOCK_BITS => Self::Lblen(
366+
parse_u8(payload)
367+
.context("invalid SEG6_LOCAL_FLV_LCBLOCK_BITS value")?,
368+
),
369+
SEG6_LOCAL_FLV_LCNODE_FN_BITS => Self::Nflen(
370+
parse_u8(payload)
371+
.context("invalid SEG6_LOCAL_FLV_LCNODE_FN_BITS value")?,
372+
),
373+
_ => Self::Other(
374+
DefaultNla::parse(buf)
375+
.context("invalid NLA value (unknown type) value")?,
376+
),
372377
})
373378
}
374379
}

0 commit comments

Comments
 (0)