Skip to content

Commit aa625d1

Browse files
cathay4tcathay4t
committed
Run cargo clippy and cargo fmt
Signed-off-by: Gris Ge <[email protected]>
1 parent 3270863 commit aa625d1

32 files changed

+184
-195
lines changed

‎.rustfmt.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
max_width = 80
22
wrap_comments = true
33
reorder_imports = true
4+
format_strings = true
45
edition = "2021"

‎examples/dump_neighbour_tables.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn main() {
5050
NetlinkPayload::InnerMessage(
5151
RouteNetlinkMessage::NewNeighbourTable(entry),
5252
) => {
53-
println!("HAHA {:?}", entry);
53+
println!("HAHA {entry:?}");
5454
}
5555
NetlinkPayload::Error(err) => {
5656
eprintln!("Received a netlink error message: {err:?}");

‎src/address/attribute.rs

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,8 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
124124
Self::Address(IpAddr::from(data))
125125
} else {
126126
return Err(DecodeError::from(format!(
127-
"Invalid IFA_LOCAL, got unexpected length \
128-
of payload {:?}",
129-
payload
127+
"Invalid IFA_LOCAL, got unexpected length of payload \
128+
{payload:?}"
130129
)));
131130
}
132131
}
@@ -141,9 +140,8 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
141140
Self::Local(IpAddr::from(data))
142141
} else {
143142
return Err(DecodeError::from(format!(
144-
"Invalid IFA_LOCAL, got unexpected length \
145-
of payload {:?}",
146-
payload
143+
"Invalid IFA_LOCAL, got unexpected length of payload \
144+
{payload:?}"
147145
)));
148146
}
149147
}
@@ -157,9 +155,8 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
157155
Self::Broadcast(Ipv4Addr::from(data))
158156
} else {
159157
return Err(DecodeError::from(format!(
160-
"Invalid IFA_BROADCAST, got unexpected length \
161-
of IPv4 address payload {:?}",
162-
payload
158+
"Invalid IFA_BROADCAST, got unexpected length of IPv4 \
159+
address payload {payload:?}"
163160
)));
164161
}
165162
}
@@ -170,15 +167,14 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
170167
Self::Anycast(Ipv6Addr::from(data))
171168
} else {
172169
return Err(DecodeError::from(format!(
173-
"Invalid IFA_ANYCAST, got unexpected length \
174-
of IPv6 address payload {:?}",
175-
payload
170+
"Invalid IFA_ANYCAST, got unexpected length of IPv6 \
171+
address payload {payload:?}"
176172
)));
177173
}
178174
}
179175
IFA_CACHEINFO => Self::CacheInfo(
180176
CacheInfo::parse(&CacheInfoBuffer::new(payload))
181-
.context(format!("Invalid IFA_CACHEINFO {:?}", payload))?,
177+
.context(format!("Invalid IFA_CACHEINFO {payload:?}"))?,
182178
),
183179
IFA_MULTICAST => {
184180
if payload.len() == IPV6_ADDR_LEN {
@@ -187,9 +183,8 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
187183
Self::Multicast(Ipv6Addr::from(data))
188184
} else {
189185
return Err(DecodeError::from(format!(
190-
"Invalid IFA_MULTICAST, got unexpected length \
191-
of IPv6 address payload {:?}",
192-
payload
186+
"Invalid IFA_MULTICAST, got unexpected length of IPv6 \
187+
address payload {payload:?}"
193188
)));
194189
}
195190
}

‎src/ip.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ pub(crate) fn parse_ipv4_addr(raw: &[u8]) -> Result<Ipv4Addr, DecodeError> {
1212
Ok(Ipv4Addr::new(raw[0], raw[1], raw[2], raw[3]))
1313
} else {
1414
Err(DecodeError::from(format!(
15-
"Invalid u8 array length {}, expecting \
16-
{IPV4_ADDR_LEN} for IPv4 address, got {:?}",
15+
"Invalid u8 array length {}, expecting {IPV4_ADDR_LEN} for IPv4 \
16+
address, got {:?}",
1717
raw.len(),
1818
raw,
1919
)))
@@ -27,8 +27,8 @@ pub(crate) fn parse_ipv6_addr(raw: &[u8]) -> Result<Ipv6Addr, DecodeError> {
2727
Ok(Ipv6Addr::from(data))
2828
} else {
2929
Err(DecodeError::from(format!(
30-
"Invalid u8 array length {}, expecting {IPV6_ADDR_LEN} \
31-
for IPv6 address, got {:?}",
30+
"Invalid u8 array length {}, expecting {IPV6_ADDR_LEN} for IPv6 \
31+
address, got {:?}",
3232
raw.len(),
3333
raw,
3434
)))
@@ -49,8 +49,8 @@ pub(crate) fn parse_ip_addr(raw: &[u8]) -> Result<IpAddr, DecodeError> {
4949
parse_ipv4_addr(raw).map(IpAddr::from)
5050
} else {
5151
Err(DecodeError::from(format!(
52-
"Invalid u8 array length {}, expecting {IPV6_ADDR_LEN} \
53-
for IPv6 address or {IPV4_ADDR_LEN} for IPv4 address, got {:?}",
52+
"Invalid u8 array length {}, expecting {IPV6_ADDR_LEN} for IPv6 \
53+
address or {IPV4_ADDR_LEN} for IPv4 address, got {:?}",
5454
raw.len(),
5555
raw,
5656
)))

‎src/link/af_spec/bridge.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ impl TryFrom<&[u8]> for BridgeVlanInfo {
189189
})
190190
} else {
191191
Err(DecodeError::from(format!(
192-
"Invalid IFLA_BRIDGE_VLAN_INFO value, expecting [u8;4], \
193-
but got {raw:?}"
192+
"Invalid IFLA_BRIDGE_VLAN_INFO value, expecting [u8;4], but \
193+
got {raw:?}"
194194
)))
195195
}
196196
}

‎src/link/af_spec/inet6.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for AfSpecInet6 {
122122
IFLA_INET6_CACHEINFO => CacheInfo(
123123
Inet6CacheInfo::parse(&Inet6CacheInfoBuffer::new(payload))
124124
.context(format!(
125-
"invalid IFLA_INET6_CACHEINFO value {:?}",
126-
payload
125+
"invalid IFLA_INET6_CACHEINFO value {payload:?}"
127126
))?,
128127
),
129128
IFLA_INET6_CONF => DevConf(
@@ -136,8 +135,7 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for AfSpecInet6 {
136135
.as_slice(),
137136
))
138137
.context(format!(
139-
"invalid IFLA_INET6_CONF value {:?}",
140-
payload
138+
"invalid IFLA_INET6_CONF value {payload:?}"
141139
))?,
142140
),
143141
IFLA_INET6_STATS => Stats(
@@ -150,8 +148,7 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for AfSpecInet6 {
150148
.as_slice(),
151149
))
152150
.context(format!(
153-
"invalid IFLA_INET6_STATS value {:?}",
154-
payload
151+
"invalid IFLA_INET6_STATS value {payload:?}"
155152
))?,
156153
),
157154
IFLA_INET6_ICMP6STATS => Icmp6Stats(
@@ -164,8 +161,7 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for AfSpecInet6 {
164161
.as_slice(),
165162
))
166163
.context(format!(
167-
"invalid IFLA_INET6_ICMP6STATS value {:?}",
168-
payload
164+
"invalid IFLA_INET6_ICMP6STATS value {payload:?}"
169165
))?,
170166
),
171167
IFLA_INET6_TOKEN => Token(

‎src/link/af_spec/unspec.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
7676
}
7777
kind => AfSpecUnspec::Other(DefaultNla::parse(&nla).context(
7878
format!(
79-
"Unknown AF_XXX type {kind} for IFLA_AF_SPEC(AF_UNSPEC)"
79+
"Unknown AF_XXX type {kind} for \
80+
IFLA_AF_SPEC(AF_UNSPEC)"
8081
),
8182
)?),
8283
})

‎src/link/attribute.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,8 @@ impl<'a, T: AsRef<[u8]> + ?Sized>
465465
),
466466
_ => Self::ProtoInfoUnknown(
467467
DefaultNla::parse(buf).context(format!(
468-
"invalid IFLA_PROTINFO for \
469-
{interface_family:?}: {payload:?}"
468+
"invalid IFLA_PROTINFO for {interface_family:?}: \
469+
{payload:?}"
470470
))?,
471471
),
472472
}
@@ -614,7 +614,7 @@ impl<'a, T: AsRef<[u8]> + ?Sized>
614614
),
615615
IFLA_MAP => {
616616
let err =
617-
|payload| format!("Invalid IFLA_MAP value {:?}", payload);
617+
|payload| format!("Invalid IFLA_MAP value {payload:?}");
618618
Self::Map(
619619
super::Map::parse(
620620
&MapBuffer::new_checked(payload)
@@ -632,7 +632,7 @@ impl<'a, T: AsRef<[u8]> + ?Sized>
632632
)
633633
.as_slice(),
634634
))
635-
.context(format!("Invalid IFLA_STATS value {:?}", payload))?,
635+
.context(format!("Invalid IFLA_STATS value {payload:?}"))?,
636636
),
637637
IFLA_STATS64 => {
638638
let payload = expand_buffer_if_small(
@@ -645,8 +645,7 @@ impl<'a, T: AsRef<[u8]> + ?Sized>
645645
payload.as_slice(),
646646
))
647647
.context(format!(
648-
"Invalid IFLA_STATS64 value {:?}",
649-
payload
648+
"Invalid IFLA_STATS64 value {payload:?}"
650649
))?,
651650
)
652651
}

‎src/link/buffer_tool.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ pub(crate) fn expand_buffer_if_small(
99
match payload.len() {
1010
l if l > expected_size => {
1111
log::warn!(
12-
"Specified {nla_name} NLA attribute holds \
13-
more(most likely new kernel) data which is unknown to \
14-
netlink-packet-route crate, expecting \
15-
{expected_size}, got {}",
12+
"Specified {nla_name} NLA attribute holds more(most likely \
13+
new kernel) data which is unknown to netlink-packet-route \
14+
crate, expecting {expected_size}, got {}",
1615
got.len()
1716
);
1817
}

‎src/link/down_reason.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
3737
}
3838
kind => Self::Other(DefaultNla::parse(buf).context(format!(
3939
"unknown NLA type {kind} for IFLA_PROTO_DOWN_REASON: \
40-
{payload:?}"
40+
{payload:?}"
4141
))?),
4242
})
4343
}

‎src/link/link_info/bridge.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -624,8 +624,8 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
624624
Ok(IpAddr::V4(addr)) => Ipv4Address(addr),
625625
Ok(v) => {
626626
return Err(DecodeError::from(format!(
627-
"Invalid BRIDGE_QUERIER_IP_ADDRESS, \
628-
expecting IPv4 address, but got {v}"
627+
"Invalid BRIDGE_QUERIER_IP_ADDRESS, expecting IPv4 \
628+
address, but got {v}"
629629
)))
630630
}
631631
Err(e) => {
@@ -638,8 +638,8 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
638638
Ok(IpAddr::V6(addr)) => Ipv6Address(addr),
639639
Ok(v) => {
640640
return Err(DecodeError::from(format!(
641-
"Invalid BRIDGE_QUERIER_IPV6_ADDRESS, \
642-
expecting IPv6 address, but got {v}"
641+
"Invalid BRIDGE_QUERIER_IPV6_ADDRESS, expecting IPv6 \
642+
address, but got {v}"
643643
)));
644644
}
645645
Err(e) => {

‎src/link/link_info/bridge_port.rs

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,7 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
312312
),
313313
IFLA_BRPORT_FAST_LEAVE => InfoBridgePort::FastLeave(
314314
parse_u8(payload).with_context(|| {
315-
format!(
316-
"invalid IFLA_BRPORT_FAST_LEAVE {payload:?}"
317-
)
315+
format!("invalid IFLA_BRPORT_FAST_LEAVE {payload:?}")
318316
})? > 0,
319317
),
320318
IFLA_BRPORT_LEARNING => InfoBridgePort::Learning(
@@ -338,14 +336,14 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
338336
})? > 0,
339337
),
340338
IFLA_BRPORT_ROOT_ID => Self::RootId(
341-
BridgeId::parse(&BridgeIdBuffer::new(payload)).with_context(|| {
342-
format!("invalid IFLA_BRPORT_ROOT_ID {payload:?}")
343-
})?,
339+
BridgeId::parse(&BridgeIdBuffer::new(payload)).with_context(
340+
|| format!("invalid IFLA_BRPORT_ROOT_ID {payload:?}"),
341+
)?,
344342
),
345343
IFLA_BRPORT_BRIDGE_ID => Self::BridgeId(
346-
BridgeId::parse(&BridgeIdBuffer::new(payload)).with_context(|| {
347-
format!("invalid IFLA_BRPORT_BRIDGE_ID {payload:?}")
348-
})?,
344+
BridgeId::parse(&BridgeIdBuffer::new(payload)).with_context(
345+
|| format!("invalid IFLA_BRPORT_BRIDGE_ID {payload:?}"),
346+
)?,
349347
),
350348
IFLA_BRPORT_DESIGNATED_PORT => InfoBridgePort::DesignatedPort(
351349
parse_u16(payload).with_context(|| {
@@ -358,20 +356,21 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
358356
})?,
359357
),
360358
IFLA_BRPORT_ID => {
361-
InfoBridgePort::PortId(parse_u16(payload).with_context(|| {
362-
format!("invalid IFLA_BRPORT_ID {payload:?}")
363-
})?)
359+
InfoBridgePort::PortId(parse_u16(payload).with_context(
360+
|| format!("invalid IFLA_BRPORT_ID {payload:?}"),
361+
)?)
364362
}
365363
IFLA_BRPORT_NO => {
366-
InfoBridgePort::PortNumber(parse_u16(payload).with_context(|| {
367-
format!("invalid IFLA_BRPORT_NO {payload:?}")
368-
})?)
364+
InfoBridgePort::PortNumber(parse_u16(payload).with_context(
365+
|| format!("invalid IFLA_BRPORT_NO {payload:?}"),
366+
)?)
369367
}
370368
IFLA_BRPORT_TOPOLOGY_CHANGE_ACK => {
371369
InfoBridgePort::TopologyChangeAck(
372370
parse_u8(payload).with_context(|| {
373371
format!(
374-
"invalid IFLA_BRPORT_TOPOLOGY_CHANGE_ACK {payload:?}"
372+
"invalid IFLA_BRPORT_TOPOLOGY_CHANGE_ACK \
373+
{payload:?}"
375374
)
376375
})? > 0,
377376
)
@@ -390,7 +389,8 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
390389
InfoBridgePort::ForwardDelayTimer(
391390
parse_u64(payload).with_context(|| {
392391
format!(
393-
"invalid IFLA_BRPORT_FORWARD_DELAY_TIMER {payload:?}"
392+
"invalid IFLA_BRPORT_FORWARD_DELAY_TIMER \
393+
{payload:?}"
394394
)
395395
})?,
396396
)
@@ -464,7 +464,8 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
464464
InfoBridgePort::MulticastEhtHostsLimit(
465465
parse_u32(payload).with_context(|| {
466466
format!(
467-
"invalid IFLA_BRPORT_MCAST_EHT_HOSTS_LIMIT {payload:?}"
467+
"invalid IFLA_BRPORT_MCAST_EHT_HOSTS_LIMIT \
468+
{payload:?}"
468469
)
469470
})?,
470471
)
@@ -473,9 +474,10 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
473474
InfoBridgePort::MulticastEhtHostsCnt(
474475
parse_u32(payload).with_context(|| {
475476
format!(
476-
"invalid IFLA_BRPORT_MCAST_EHT_HOSTS_CNT {payload:?}"
477+
"invalid IFLA_BRPORT_MCAST_EHT_HOSTS_CNT \
478+
{payload:?}"
477479
)
478-
})?
480+
})?,
479481
)
480482
}
481483
IFLA_BRPORT_LOCKED => InfoBridgePort::Locked(
@@ -498,13 +500,16 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
498500
format!("invalid IFLA_BRPORT_MCAST_MAX_GROUPS {payload:?}")
499501
})?,
500502
),
501-
IFLA_BRPORT_NEIGH_VLAN_SUPPRESS => InfoBridgePort::NeighVlanSupress(
502-
parse_u8(payload).with_context(|| {
503-
format!(
504-
"invalid IFLA_BRPORT_NEIGH_VLAN_SUPPRESS {payload:?}"
505-
)
506-
})? > 0,
507-
),
503+
IFLA_BRPORT_NEIGH_VLAN_SUPPRESS => {
504+
InfoBridgePort::NeighVlanSupress(
505+
parse_u8(payload).with_context(|| {
506+
format!(
507+
"invalid IFLA_BRPORT_NEIGH_VLAN_SUPPRESS \
508+
{payload:?}"
509+
)
510+
})? > 0,
511+
)
512+
}
508513
IFLA_BRPORT_BACKUP_NHID => InfoBridgePort::BackupNextHopId(
509514
parse_u32(payload).with_context(|| {
510515
format!("invalid IFLA_BRPORT_BACKUP_NHID {payload:?}")
@@ -513,7 +518,8 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
513518
kind => InfoBridgePort::Other(
514519
DefaultNla::parse(buf).with_context(|| {
515520
format!(
516-
"failed to parse bridge port NLA of type '{kind}' into DefaultNla"
521+
"failed to parse bridge port NLA of type '{kind}' \
522+
into DefaultNla"
517523
)
518524
})?,
519525
),

0 commit comments

Comments
 (0)