Remove unnecessary deref vol. 2

JakubOnderka · Jul 11, 2021 · c4845a3 · c4845a3
1 parent 17aa574
commit c4845a3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/src/diesel_support.rs b/src/diesel_support.rs
@@ -38,14 +38,14 @@ impl FromSql<Cidr, Pg> for IpNetwork {
 
 impl ToSql<Cidr, Pg> for Ipv4Network {
     fn to_sql<W: Write>(&self, out: &mut Output<W, Pg>) -> serialize::Result {
-        let data = postgres_common::to_sql_ipv4_network(*self);
+        let data = postgres_common::to_sql_ipv4_network(self);
         out.write_all(&data).map(|_| IsNull::No).map_err(Into::into)
     }
 }
 
 impl ToSql<Cidr, Pg> for Ipv6Network {
     fn to_sql<W: Write>(&self, out: &mut Output<W, Pg>) -> serialize::Result {
-        let data = postgres_common::to_sql_ipv6_network(*self);
+        let data = postgres_common::to_sql_ipv6_network(self);
         out.write_all(&data).map(|_| IsNull::No).map_err(Into::into)
     }
 }

diff --git a/src/postgres_common.rs b/src/postgres_common.rs
@@ -52,7 +52,7 @@ pub fn from_sql_ipv6_network(raw: &[u8]) -> Result<Ipv6Network, Box<dyn Error +
 }
 
 #[inline]
-pub fn to_sql_ipv4_network(network: Ipv4Network) -> [u8; 8] {
+pub fn to_sql_ipv4_network(network: &Ipv4Network) -> [u8; 8] {
     let ip_octets = network.network_address().octets();
     let mut bytes = [0; 8];
     bytes[0] = IPV4_TYPE;
@@ -64,7 +64,7 @@ pub fn to_sql_ipv4_network(network: Ipv4Network) -> [u8; 8] {
 }
 
 #[inline]
-pub fn to_sql_ipv6_network(network: Ipv6Network) -> [u8; 20] {
+pub fn to_sql_ipv6_network(network: &Ipv6Network) -> [u8; 20] {
     let ip_octets = network.network_address().octets();
     let mut bytes = [0; 20];
     bytes[0] = IPV6_TYPE;

diff --git a/src/postgres_support.rs b/src/postgres_support.rs
@@ -36,7 +36,7 @@ impl FromSql for IpNetwork {
 
 impl ToSql for Ipv4Network {
     fn to_sql(&self, _: &Type, w: &mut Vec<u8>) -> PostgresResult<IsNull> {
-        let bytes = postgres_common::to_sql_ipv4_network(*self);
+        let bytes = postgres_common::to_sql_ipv4_network(self);
         w.extend_from_slice(&bytes);
 
         Ok(IsNull::No)
@@ -48,7 +48,7 @@ impl ToSql for Ipv4Network {
 
 impl ToSql for Ipv6Network {
     fn to_sql(&self, _: &Type, w: &mut Vec<u8>) -> PostgresResult<IsNull> {
-        let bytes = postgres_common::to_sql_ipv6_network(*self);
+        let bytes = postgres_common::to_sql_ipv6_network(self);
         w.extend_from_slice(&bytes);
 
         Ok(IsNull::No)

diff --git a/src/serde_support.rs b/src/serde_support.rs
@@ -12,13 +12,9 @@ impl Serialize for IpNetwork {
         if serializer.is_human_readable() {
             serializer.serialize_str(&self.to_string())
         } else {
-            match *self {
-                IpNetwork::V4(ref a) => {
-                    serializer.serialize_newtype_variant("IpNetwork", 0, "V4", a)
-                }
-                IpNetwork::V6(ref a) => {
-                    serializer.serialize_newtype_variant("IpNetwork", 1, "V6", a)
-                }
+            match self {
+                IpNetwork::V4(a) => serializer.serialize_newtype_variant("IpNetwork", 0, "V4", a),
+                IpNetwork::V6(a) => serializer.serialize_newtype_variant("IpNetwork", 1, "V6", a),
             }
         }
     }