From 79916104babf84894cf68fe853c850081feababf Mon Sep 17 00:00:00 2001 From: Dennis Schwerdel Date: Sun, 19 Dec 2021 13:54:09 +0100 Subject: [PATCH] Make clippy happy --- src/cloud.rs | 4 ++-- src/config.rs | 2 +- src/crypto/core.rs | 2 +- src/crypto/init.rs | 10 +++++----- src/crypto/rotate.rs | 14 +++++++------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/cloud.rs b/src/cloud.rs index 4600310..32c328c 100644 --- a/src/cloud.rs +++ b/src/cloud.rs @@ -379,7 +379,7 @@ impl GenericCloud GenericCloud = SmallVec::new(); - for (&addr, ref data) in &self.peers { + for (&addr, data) in &self.peers { if data.timeout < now { del.push(addr); } diff --git a/src/config.rs b/src/config.rs index 6c09b0a..ab11021 100644 --- a/src/config.rs +++ b/src/config.rs @@ -354,7 +354,7 @@ impl Config { if let Some(ref s) = self.hook { script = Some(s); } - if let Some(ref s) = self.hooks.get(event) { + if let Some(s) = self.hooks.get(event) { script = Some(s); } if script.is_none() { diff --git a/src/crypto/core.rs b/src/crypto/core.rs index 1ebc6dc..0c80394 100644 --- a/src/crypto/core.rs +++ b/src/crypto/core.rs @@ -110,7 +110,7 @@ struct CryptoKey { impl CryptoKey { fn new(rand: &SystemRandom, key: LessSafeKey, nonce_half: bool) -> Self { - let mut send_nonce = Nonce::random(&rand); + let mut send_nonce = Nonce::random(rand); send_nonce.set_msb(if nonce_half { 0x80 } else { 0x00 }); CryptoKey { key, diff --git a/src/crypto/init.rs b/src/crypto/init.rs index 39b0df1..0e5d13c 100644 --- a/src/crypto/init.rs +++ b/src/crypto/init.rs @@ -235,7 +235,7 @@ impl InitMsg { let signed_data = &r.into_inner()[0..pos]; let public_key = signature::UnparsedPublicKey::new(&ED25519, &public_key_data); - if public_key.verify(&signed_data, &signature).is_err() { + if public_key.verify(signed_data, &signature).is_err() { return Err(Error::Crypto("invalid signature")); } @@ -319,7 +319,7 @@ impl InitMsg { w.write_u8(Self::PART_ECDH_PUBLIC_KEY)?; let key_bytes = ecdh_public_key.bytes(); w.write_u16::(key_bytes.len() as u16)?; - w.write_all(&key_bytes)?; + w.write_all(key_bytes)?; } _ => (), } @@ -522,8 +522,8 @@ impl InitState

{ }, _ => unreachable!(), }; - let mut bytes = out.buffer(); - let len = msg.write_to(&mut bytes, &self.key_pair).expect("Buffer too small"); + let bytes = out.buffer(); + let len = msg.write_to(bytes, &self.key_pair).expect("Buffer too small"); self.last_message = Some(bytes[0..len].to_vec()); out.set_length(len); } @@ -662,7 +662,7 @@ mod tests { impl Payload for Vec { fn write_to(&self, buffer: &mut MsgBuffer) { - buffer.buffer().write_all(&self).expect("Buffer too small"); + buffer.buffer().write_all(self).expect("Buffer too small"); buffer.set_length(self.len()) } diff --git a/src/crypto/rotate.rs b/src/crypto/rotate.rs index 4deec81..74277d1 100644 --- a/src/crypto/rotate.rs +++ b/src/crypto/rotate.rs @@ -176,7 +176,7 @@ impl RotationState { if let Some(ref private_key) = self.proposed { // Still a proposed key that has not been confirmed, proposal must have been lost if self.timeout { - let proposed_key = Self::compute_public_key(&private_key); + let proposed_key = Self::compute_public_key(private_key); if let Some((ref confirmed_key, message_id)) = self.confirmed { // Reconfirm last confirmed key Self::send( @@ -271,7 +271,7 @@ mod tests { assert!(key2.is_some()); let key2 = key2.unwrap(); assert_eq!(key2.id, 2); - assert_eq!(key2.use_for_sending, false); + assert!(!key2.use_for_sending); assert!(!out2.is_empty()); let msg2 = out2.msg().unwrap(); assert_eq!(msg2.message_id, 2); @@ -281,14 +281,14 @@ mod tests { assert!(key.is_some()); let key = key.unwrap(); assert_eq!(key.id, 2); - assert_eq!(key.use_for_sending, true); + assert!(key.use_for_sending); // Cycle 2 let key1 = node1.cycle(&mut out1); let key2 = node2.cycle(&mut out2); assert!(key1.is_some()); let key1 = key1.unwrap(); assert_eq!(key1.id, 3); - assert_eq!(key1.use_for_sending, false); + assert!(!key1.use_for_sending); assert!(!out1.is_empty()); let msg1 = out1.msg().unwrap(); assert_eq!(msg1.message_id, 3); @@ -300,7 +300,7 @@ mod tests { assert!(key.is_some()); let key = key.unwrap(); assert_eq!(key.id, 3); - assert_eq!(key.use_for_sending, true); + assert!(key.use_for_sending); // Cycle 3 let key1 = node1.cycle(&mut out1); let key2 = node2.cycle(&mut out2); @@ -309,7 +309,7 @@ mod tests { assert!(key2.is_some()); let key2 = key2.unwrap(); assert_eq!(key2.id, 4); - assert_eq!(key2.use_for_sending, false); + assert!(!key2.use_for_sending); assert!(!out2.is_empty()); let msg2 = out2.msg().unwrap(); assert_eq!(msg2.message_id, 4); @@ -319,7 +319,7 @@ mod tests { assert!(key.is_some()); let key = key.unwrap(); assert_eq!(key.id, 4); - assert_eq!(key.use_for_sending, true); + assert!(key.use_for_sending); } #[test]