Skip to content

Commit 504b1b2

Browse files
cathay4tcathay4t
committed
Run cargo clippy and cargo fmt
Signed-off-by: Gris Ge <fge@redhat.com>
1 parent 8d3f0d2 commit 504b1b2

File tree

12 files changed

+99
-98
lines changed

12 files changed

+99
-98
lines changed

‎src/address.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ buffer!(AddressBuffer(XFRM_ADDRESS_LEN) {
2020
impl<T: AsRef<[u8]> + ?Sized> Parseable<AddressBuffer<&T>> for Address {
2121
fn parse(buf: &AddressBuffer<&T>) -> Result<Self, DecodeError> {
2222
let mut addr_payload: [u8; XFRM_ADDRESS_LEN] = [0; XFRM_ADDRESS_LEN];
23-
addr_payload.clone_from_slice(&buf.addr());
23+
addr_payload.clone_from_slice(buf.addr());
2424
Ok(Address { addr: addr_payload })
2525
}
2626
}

‎src/constants.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pub const XFRMA_ALG_CRYPT: u16 = 2; /* struct xfrm_algo */
3939
pub const XFRMA_ALG_COMP: u16 = 3; /* struct xfrm_algo */
4040
pub const XFRMA_ENCAP: u16 = 4; /* struct xfrm_algo + struct xfrm_encap_tmpl */
4141
pub const XFRMA_TMPL: u16 = 5; /* 1 or more struct xfrm_user_tmpl */
42-
pub const XFRMA_SA: u16 = 6; /* struct xfrm_usersa_info */
42+
pub const XFRMA_SA: u16 = 6; /* struct xfrm_usersa_info */
4343
pub const XFRMA_POLICY: u16 = 7; /* struct xfrm_userpolicy_info */
4444
pub const XFRMA_SEC_CTX: u16 = 8; /* struct xfrm_sec_ctx */
4545
pub const XFRMA_LTIME_VAL: u16 = 9; /* struct xfrm_lifetime_cur */
@@ -48,7 +48,7 @@ pub const XFRMA_REPLAY_THRESH: u16 = 11; /* __u32 */
4848
pub const XFRMA_ETIMER_THRESH: u16 = 12; /* __u32 */
4949
pub const XFRMA_SRCADDR: u16 = 13; /* xfrm_address_t */
5050
pub const XFRMA_COADDR: u16 = 14; /* xfrm_address_t */
51-
pub const XFRMA_LASTUSED: u16 = 15; /* unsigned long */
51+
pub const XFRMA_LASTUSED: u16 = 15; /* unsigned long */
5252
pub const XFRMA_POLICY_TYPE: u16 = 16; /* struct xfrm_userpolicy_type */
5353
pub const XFRMA_MIGRATE: u16 = 17; /* struct xfrm_user_migrate */
5454
pub const XFRMA_ALG_AEAD: u16 = 18; /* struct xfrm_algo_aead */
@@ -135,7 +135,7 @@ pub const IPPROTO_ESP: u8 = libc::IPPROTO_ESP as u8; // 50
135135
pub const IPPROTO_AH: u8 = libc::IPPROTO_AH as u8; // 51
136136
pub const IPPROTO_DSTOPTS: u8 = libc::IPPROTO_DSTOPTS as u8; // 60
137137
pub const IPPROTO_COMP: u8 = libc::IPPROTO_COMP as u8; // 108
138-
pub const IPSEC_PROTO_ANY: u8 = 255 as u8;
138+
pub const IPSEC_PROTO_ANY: u8 = 255_u8;
139139

140140
// ==========================================
141141
// XFRM Mode
@@ -186,7 +186,7 @@ pub const XFRM_SC_ALG_SELINUX: u8 = 1;
186186
// Async Event flags
187187
// ==========================================
188188
pub const XFRM_AE_UNSPEC: u32 = 0;
189-
pub const XFRM_AE_RTHR: u32 = 1; /* replay threshold*/
189+
pub const XFRM_AE_RTHR: u32 = 1; /* replay threshold */
190190
pub const XFRM_AE_RVAL: u32 = 2; /* replay value */
191191
pub const XFRM_AE_LVAL: u32 = 4; /* lifetime value */
192192
pub const XFRM_AE_ETHR: u32 = 8; /* expiry timer threshold */

‎src/nlas/alg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ buffer!(AlgBuffer(XFRM_ALG_HEADER_LEN) {
2828
impl<T: AsRef<[u8]> + ?Sized> Parseable<AlgBuffer<&T>> for Alg {
2929
fn parse(buf: &AlgBuffer<&T>) -> Result<Self, DecodeError> {
3030
let mut alg_name: [u8; XFRM_ALG_NAME_LEN] = [0; XFRM_ALG_NAME_LEN];
31-
alg_name.clone_from_slice(&buf.alg_name());
31+
alg_name.clone_from_slice(buf.alg_name());
3232

3333
Ok(Alg {
3434
alg_name,

‎src/nlas/alg_aead.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl<T: AsRef<[u8]> + ?Sized> Parseable<AlgAeadBuffer<&T>> for AlgAead {
3333
fn parse(buf: &AlgAeadBuffer<&T>) -> Result<Self, DecodeError> {
3434
let mut alg_name: [u8; XFRM_ALG_AEAD_NAME_LEN] =
3535
[0; XFRM_ALG_AEAD_NAME_LEN];
36-
alg_name.clone_from_slice(&buf.alg_name());
36+
alg_name.clone_from_slice(buf.alg_name());
3737

3838
Ok(AlgAead {
3939
alg_name,

‎src/nlas/alg_auth.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl<T: AsRef<[u8]> + ?Sized> Parseable<AlgAuthBuffer<&T>> for AlgAuth {
3333
fn parse(buf: &AlgAuthBuffer<&T>) -> Result<Self, DecodeError> {
3434
let mut alg_name: [u8; XFRM_ALG_AUTH_NAME_LEN] =
3535
[0; XFRM_ALG_AUTH_NAME_LEN];
36-
alg_name.clone_from_slice(&buf.alg_name());
36+
alg_name.clone_from_slice(buf.alg_name());
3737

3838
Ok(AlgAuth {
3939
alg_name,

‎src/nlas/mod.rs

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ pub use replay::*;
2424
pub mod replay_esn;
2525
pub use replay_esn::*;
2626

27+
#[allow(clippy::len_without_is_empty)]
2728
pub mod security_ctx;
2829
pub use security_ctx::*;
2930

@@ -66,7 +67,8 @@ pub enum XfrmAttrs {
6667
EncapsulationTemplate(EncapTmpl),
6768
EncryptionAlg(Alg),
6869
EncryptionAlgAead(AlgAead),
69-
EventTimeThreshold(u32), // replay event timer threshold (rate limit in ms)
70+
EventTimeThreshold(u32), /* replay event timer threshold (rate limit in
71+
* ms) */
7072
ExtraFlags(u32),
7173
IfId(u32),
7274
KmAddress(UserKmAddress),
@@ -138,7 +140,6 @@ impl Nla for XfrmAttrs {
138140
}
139141
}
140142

141-
#[rustfmt::skip]
142143
fn emit_value(&self, buffer: &mut [u8]) {
143144
use self::XfrmAttrs::*;
144145
match *self {
@@ -162,7 +163,9 @@ impl Nla for XfrmAttrs {
162163
MarkVal(ref v) => NativeEndian::write_u32(buffer, *v),
163164
Migrate(ref v) => v.emit(buffer),
164165
OffloadDevice(ref v) => v.emit(buffer),
165-
Pad() => /*ignore*/return,
166+
Pad() =>
167+
/* ignore */
168+
{}
166169
PolicyInfo(ref v) => v.emit(buffer),
167170
PolicyType(ref v) => v.emit(buffer),
168171
Proto(ref v) => buffer[0] = *v,
@@ -174,20 +177,18 @@ impl Nla for XfrmAttrs {
174177
SrcAddr(ref v) => v.emit(buffer),
175178
Template(ref v) => {
176179
let mut it_tmpl = v.iter();
177-
let mut it_buf = buffer.chunks_exact_mut(XFRM_USER_TEMPLATE_LEN);
178-
180+
let mut it_buf =
181+
buffer.chunks_exact_mut(XFRM_USER_TEMPLATE_LEN);
179182
loop {
180-
if let Some(tmpl) = it_tmpl.next() {
181-
if let Some(buf) = it_buf.next() {
182-
tmpl.emit(buf);
183-
} else {
184-
break;
185-
}
183+
if let (Some(tmpl), Some(buf)) =
184+
(it_tmpl.next(), it_buf.next())
185+
{
186+
tmpl.emit(buf);
186187
} else {
187188
break;
188189
}
189190
}
190-
},
191+
}
191192
TfcPadding(ref v) => NativeEndian::write_u32(buffer, *v),
192193
Unspec(ref bytes) => buffer.copy_from_slice(bytes.as_slice()),
193194

@@ -354,9 +355,9 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for XfrmAttrs {
354355
),
355356
XFRMA_TMPL => {
356357
let mut tmpls: Vec<UserTemplate> = vec![];
357-
let mut it = payload.chunks_exact(XFRM_USER_TEMPLATE_LEN);
358+
let it = payload.chunks_exact(XFRM_USER_TEMPLATE_LEN);
358359

359-
while let Some(t) = it.next() {
360+
for t in it {
360361
let tmpl =
361362
UserTemplate::parse(&UserTemplateBuffer::new(&t))
362363
.context("invalid XFRMA_TMPL")?;
@@ -371,7 +372,7 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for XfrmAttrs {
371372

372373
kind => Other(
373374
DefaultNla::parse(buf)
374-
.context(format!("unknown NLA type {}", kind))?,
375+
.context(format!("unknown NLA type {kind}"))?,
375376
),
376377
})
377378
}

‎src/nlas/security_ctx.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ impl Emitable for SecurityCtx {
6868
}
6969

7070
impl SecurityCtx {
71-
pub fn context(&mut self, secctx: &Vec<u8>) {
71+
pub fn context(&mut self, secctx: &[u8]) {
7272
// The kernel limits the length of the security context
7373
// string to the page size, which is commonly 4096.
7474
// iproute2 limits it to 256 when parsing from the cli.
7575
// Keeping it at 256 should be plenty, but if it needs to
7676
// be a little more generous, it can be raised.
77-
let mut ctx_str = secctx.clone();
77+
let mut ctx_str = secctx.to_vec();
7878
ctx_str.truncate(256);
7979
self.ctx_len = ctx_str.len() as u16;
8080
self.ctx_str = ctx_str;

‎src/policy/spdinfo/message.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl Emitable for NewSpdInfoMessage {
2323
fn emit(&self, buffer: &mut [u8]) {
2424
let mut buffer = NewSpdInfoMessageBuffer::new(buffer);
2525
buffer.set_flags(self.flags);
26-
self.nlas.as_slice().emit(&mut buffer.attributes_mut());
26+
self.nlas.as_slice().emit(buffer.attributes_mut());
2727
}
2828
}
2929

‎src/policy/spdinfo/nlas/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for SpdInfoAttrs {
8787
),
8888
kind => Other(
8989
DefaultNla::parse(buf)
90-
.context(format!("unknown NLA type {}", kind))?,
90+
.context(format!("unknown NLA type {kind}"))?,
9191
),
9292
})
9393
}

‎src/state/sadinfo/message.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl Emitable for NewSadInfoMessage {
2323
fn emit(&self, buffer: &mut [u8]) {
2424
let mut buffer = NewSadInfoMessageBuffer::new(buffer);
2525
buffer.set_flags(self.flags);
26-
self.nlas.as_slice().emit(&mut buffer.attributes_mut());
26+
self.nlas.as_slice().emit(buffer.attributes_mut());
2727
}
2828
}
2929

0 commit comments

Comments
 (0)