Use match ergonomics

Author: djc

src/config.rs

@@ -313,12 +313,12 @@ impl fmt::Display for Config {
         }
 
         if self.last_search != LastSearch::Domain {
-            if let Some(ref domain) = self.domain {
+            if let Some(domain) = &self.domain {
                 writeln!(fmt, "domain {domain}")?;
             }
         }
 
-        if let Some(ref search) = self.search {
+        if let Some(search) = &self.search {
             if !search.is_empty() {
                 write!(fmt, "search")?;
                 for suffix in search.iter() {
@@ -329,7 +329,7 @@ impl fmt::Display for Config {
         }
 
         if self.last_search == LastSearch::Domain {
-            if let Some(ref domain) = self.domain {
+            if let Some(domain) = &self.domain {
                 writeln!(fmt, "domain {domain}")?;
             }
         }
@@ -418,9 +418,9 @@ impl<'a> Iterator for DomainIterInternal<'a> {
     type Item = &'a String;
 
     fn next(&mut self) -> Option<Self::Item> {
-        match *self {
-            DomainIterInternal::Search(Some(ref mut domains)) => domains.next(),
-            DomainIterInternal::Domain(ref mut domain) => domain.take(),
+        match self {
+            DomainIterInternal::Search(Some(domains)) => domains.next(),
+            DomainIterInternal::Domain(domain) => domain.take(),
             _ => None,
         }
     }

src/ip.rs

@@ -42,9 +42,9 @@ impl From<ScopedIp> for IpAddr {
 
 impl From<&ScopedIp> for IpAddr {
     fn from(val: &ScopedIp) -> Self {
-        match *val {
-            ScopedIp::V4(ref ip) => IpAddr::from(*ip),
-            ScopedIp::V6(ref ip, _) => IpAddr::from(*ip),
+        match val {
+            ScopedIp::V4(ip) => IpAddr::from(*ip),
+            ScopedIp::V6(ip, _) => IpAddr::from(*ip),
         }
     }
 }
@@ -107,10 +107,10 @@ impl FromStr for ScopedIp {
 
 impl fmt::Display for ScopedIp {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            ScopedIp::V4(ref address) => address.fmt(fmt),
-            ScopedIp::V6(ref address, None) => address.fmt(fmt),
-            ScopedIp::V6(ref address, Some(ref scope)) => write!(fmt, "{address}%{scope}"),
+        match self {
+            ScopedIp::V4(address) => address.fmt(fmt),
+            ScopedIp::V6(address, None) => address.fmt(fmt),
+            ScopedIp::V6(address, Some(scope)) => write!(fmt, "{address}%{scope}"),
         }
     }
 }