From aa414fd5277c11107abcc805c072814de88dd5ff Mon Sep 17 00:00:00 2001
From: Adam Wick <awick@uhsure.com>
Date: Fri, 31 Dec 2021 10:32:15 -0800
Subject: [PATCH] More clippy fixin's.

---
 src/messages/client_command.rs  |  6 +++---
 src/messages/server_response.rs |  4 ++--
 src/messages/utils.rs           |  2 +-
 src/network/address.rs          | 14 +++++++-------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/messages/client_command.rs b/src/messages/client_command.rs
index e1ddb63..148d4da 100644
--- a/src/messages/client_command.rs
+++ b/src/messages/client_command.rs
@@ -97,7 +97,7 @@ impl Arbitrary for ClientConnectionCommand {
             ClientConnectionCommand::EstablishTCPPortBinding,
             ClientConnectionCommand::AssociateUDPPort,
         ];
-        g.choose(&options).unwrap().clone()
+        *g.choose(&options).unwrap()
     }
 }
 
@@ -164,8 +164,8 @@ fn short_write_fails_right() {
     let mut cursor = Cursor::new(&mut buffer as &mut [u8]);
     let result = task::block_on(cmd.write(&mut cursor));
     match result {
-        Ok(_) => assert!(false, "Mysteriously able to fit > 2 bytes in 2 bytes."),
+        Ok(_) => panic!("Mysteriously able to fit > 2 bytes in 2 bytes."),
         Err(SerializationError::IOError(x)) => assert_eq!(ErrorKind::WriteZero, x.kind()),
-        Err(e) => assert!(false, "Got the wrong error writing too much data: {}", e),
+        Err(e) => panic!("Got the wrong error writing too much data: {}", e),
     }
 }
diff --git a/src/messages/server_response.rs b/src/messages/server_response.rs
index 611957e..1e60c15 100644
--- a/src/messages/server_response.rs
+++ b/src/messages/server_response.rs
@@ -200,8 +200,8 @@ fn short_write_fails_right() {
     let mut cursor = Cursor::new(&mut buffer as &mut [u8]);
     let result = task::block_on(cmd.write(&mut cursor));
     match result {
-        Ok(_) => assert!(false, "Mysteriously able to fit > 2 bytes in 2 bytes."),
+        Ok(_) => panic!("Mysteriously able to fit > 2 bytes in 2 bytes."),
         Err(SerializationError::IOError(x)) => assert_eq!(ErrorKind::WriteZero, x.kind()),
-        Err(e) => assert!(false, "Got the wrong error writing too much data: {}", e),
+        Err(e) => panic!("Got the wrong error writing too much data: {}", e),
     }
 }
diff --git a/src/messages/utils.rs b/src/messages/utils.rs
index 0ab874b..61c0a12 100644
--- a/src/messages/utils.rs
+++ b/src/messages/utils.rs
@@ -9,7 +9,7 @@ pub fn arbitrary_socks_string(g: &mut Gen) -> String {
         potential.truncate(255);
         let bytestring = potential.as_bytes();
 
-        if bytestring.len() > 0 && bytestring.len() < 256 {
+        if !bytestring.is_empty() && bytestring.len() < 256 {
             return potential;
         }
     }
diff --git a/src/network/address.rs b/src/network/address.rs
index 9f4b88b..314a06b 100644
--- a/src/network/address.rs
+++ b/src/network/address.rs
@@ -195,27 +195,27 @@ quickcheck! {
         match x {
             IpAddr::V4(ref a) =>
                 assert_eq!(Err(AddressConversionError::CouldntConvertIP4),
-                           Ipv6Addr::try_from(SOCKSv5Address::from(a.clone()))),
+                           Ipv6Addr::try_from(SOCKSv5Address::from(*a))),
             IpAddr::V6(ref a) =>
                 assert_eq!(Err(AddressConversionError::CouldntConvertIP6),
-                           Ipv4Addr::try_from(SOCKSv5Address::from(a.clone()))),
+                           Ipv4Addr::try_from(SOCKSv5Address::from(*a))),
         }
-        x == IpAddr::try_from(SOCKSv5Address::from(x.clone())).unwrap()
+        x == IpAddr::try_from(SOCKSv5Address::from(x)).unwrap()
     }
 
     fn ip4_conversion(x: Ipv4Addr) -> bool {
-        x == Ipv4Addr::try_from(SOCKSv5Address::from(x.clone())).unwrap()
+        x == Ipv4Addr::try_from(SOCKSv5Address::from(x)).unwrap()
     }
 
     fn ip6_conversion(x: Ipv6Addr) -> bool {
-        x == Ipv6Addr::try_from(SOCKSv5Address::from(x.clone())).unwrap()
+        x == Ipv6Addr::try_from(SOCKSv5Address::from(x)).unwrap()
     }
 
     fn display_matches(x: SOCKSv5Address) -> bool {
         match x {
             SOCKSv5Address::IP4(a) => format!("{}", a) == format!("{}", x),
             SOCKSv5Address::IP6(a) => format!("{}", a) == format!("{}", x),
-            SOCKSv5Address::Name(ref a) => format!("{}", a) == format!("{}", x),
+            SOCKSv5Address::Name(ref a) => *a == x.to_string(),
         }
     }
 
@@ -253,6 +253,6 @@ fn domain_name_sanity() {
     );
     assert_eq!(
         Err(AddressConversionError::CouldntConvertName),
-        Ipv6Addr::try_from(addr1.clone())
+        Ipv6Addr::try_from(addr1)
     );
 }