Use inline format arguments

Author: djc

src/config.rs

@@ -309,35 +309,35 @@ impl Config {
 impl fmt::Display for Config {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         for nameserver in self.nameservers.iter() {
-            writeln!(fmt, "nameserver {}", nameserver)?;
+            writeln!(fmt, "nameserver {nameserver}")?;
         }
 
         if self.last_search != LastSearch::Domain {
             if let Some(ref domain) = self.domain {
-                writeln!(fmt, "domain {}", domain)?;
+                writeln!(fmt, "domain {domain}")?;
             }
         }
 
         if let Some(ref search) = self.search {
             if !search.is_empty() {
                 write!(fmt, "search")?;
                 for suffix in search.iter() {
-                    write!(fmt, " {}", suffix)?;
+                    write!(fmt, " {suffix}")?;
                 }
                 writeln!(fmt)?;
             }
         }
 
         if self.last_search == LastSearch::Domain {
             if let Some(ref domain) = self.domain {
-                writeln!(fmt, "domain {}", domain)?;
+                writeln!(fmt, "domain {domain}")?;
             }
         }
 
         if !self.sortlist.is_empty() {
             write!(fmt, "sortlist")?;
             for network in self.sortlist.iter() {
-                write!(fmt, " {}", network)?;
+                write!(fmt, " {network}")?;
             }
             writeln!(fmt)?;
         }

src/grammar.rs

@@ -27,29 +27,25 @@ pub enum ParseError {
 impl std::fmt::Display for ParseError {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
-            ParseError::InvalidUtf8(line, err) => {
-                write!(f, "bad unicode at line {}: {}", line, err)
-            }
+            ParseError::InvalidUtf8(line, err) => write!(f, "bad unicode at line {line}: {err}"),
             ParseError::InvalidValue(line) => write!(
                 f,
-                "directive at line {} is improperly formatted or contains invalid value",
-                line
+                "directive at line {line} is improperly formatted or contains invalid value",
             ),
             ParseError::InvalidOptionValue(line) => write!(
                 f,
-                "directive options at line {} contains invalid value of some option",
-                line
+                "directive options at line {line} contains invalid value of some option",
             ),
             ParseError::InvalidOption(line) => {
-                write!(f, "option at line {} is not recognized", line)
+                write!(f, "option at line {line} is not recognized")
             }
             ParseError::InvalidDirective(line) => {
-                write!(f, "directive at line {} is not recognized", line)
+                write!(f, "directive at line {line} is not recognized")
             }
             ParseError::InvalidIp(line, err) => {
-                write!(f, "directive at line {} contains invalid IP: {}", line, err)
+                write!(f, "directive at line {line} contains invalid IP: {err}")
             }
-            ParseError::ExtraData(line) => write!(f, "extra data at the end of the line {}", line),
+            ParseError::ExtraData(line) => write!(f, "extra data at the end of line {line}"),
         }
     }
 }

src/ip.rs

@@ -15,8 +15,8 @@ pub enum Network {
 impl fmt::Display for Network {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         match *self {
-            Network::V4(address, mask) => write!(fmt, "{}/{}", address, mask),
-            Network::V6(address, mask) => write!(fmt, "{}/{}", address, mask),
+            Network::V4(address, mask) => write!(fmt, "{address}/{mask}"),
+            Network::V6(address, mask) => write!(fmt, "{address}/{mask}"),
         }
     }
 }
@@ -110,7 +110,7 @@ impl fmt::Display for ScopedIp {
         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),
+            ScopedIp::V6(ref address, Some(ref scope)) => write!(fmt, "{address}%{scope}"),
         }
     }
 }

tests/lib.rs

@@ -402,7 +402,7 @@ fn test_non_default_display() {
     original_config.use_vc = true;
 
     let output = original_config.to_string();
-    println!("Output:\n\n{}", output);
+    println!("Output:\n\n{output}");
     let restored_config = resolv_conf::Config::parse(&output).unwrap();
 
     assert_eq!(original_config, restored_config);
@@ -422,7 +422,7 @@ fn test_display_preservers_last_search() {
     original_config.set_domain("my.domain".to_owned());
 
     let output = original_config.to_string();
-    println!("Output:\n\n{}", output);
+    println!("Output:\n\n{output}");
     let restored_config = resolv_conf::Config::parse(&output).unwrap();
 
     assert_eq!(original_config, restored_config);