Fix various new clippy warnings

Author: sdroege

src/parser.rs

@@ -62,52 +62,52 @@ impl std::fmt::Display for ParserError {
             #[allow(deprecated)]
             ParserError::UnexpectedLine(line, c) => {
                 if let Ok(c) = char::try_from(c as u32) {
-                    write!(f, "Unexpected line {} starting with '{}'", line, c)
+                    write!(f, "Unexpected line {line} starting with '{c}'")
                 } else {
-                    write!(f, "Unexpected line {} starting with U+{:04x}", line, c)
+                    write!(f, "Unexpected line {line} starting with U+{c:04x}")
                 }
             }
             ParserError::InvalidLineFormat(line, ref s) => {
-                write!(f, "Invalid formatted line {}: \"{}\"", line, s)
+                write!(f, "Invalid formatted line {line}: \"{s}\"")
             }
             ParserError::InvalidFieldEncoding(line, s) => {
-                write!(f, "Invalid field encoding in line {} at {}", line, s)
+                write!(f, "Invalid field encoding in line {line} at {s}")
             }
             ParserError::InvalidFieldFormat(line, s) => {
-                write!(f, "Invalid field formatting in line {} at {}", line, s)
+                write!(f, "Invalid field formatting in line {line} at {s}")
             }
-            ParserError::MissingField(line, s) => write!(f, "Missing field {} in line {}", s, line),
+            ParserError::MissingField(line, s) => write!(f, "Missing field {s} in line {line}"),
             ParserError::FieldTrailingData(line, s) => {
-                write!(f, "Field {} in line {} has trailing data", s, line)
+                write!(f, "Field {s} in line {line} has trailing data")
             }
             ParserError::InvalidVersion(line, ref s) => write!(
                 f,
                 "Invalid version at line {}: {}",
                 line,
                 String::from_utf8_lossy(s)
             ),
-            ParserError::MultipleVersions(line) => write!(f, "Multiple versions in line {}", line),
+            ParserError::MultipleVersions(line) => write!(f, "Multiple versions in line {line}"),
             ParserError::NoVersion => write!(f, "No version line"),
-            ParserError::MultipleOrigins(line) => write!(f, "Multiple origins in line {}", line),
+            ParserError::MultipleOrigins(line) => write!(f, "Multiple origins in line {line}"),
             #[allow(deprecated)]
             ParserError::NoOrigin => write!(f, "No origin line"),
             ParserError::MultipleSessionNames(line) => {
-                write!(f, "Multiple session-names in line {}", line)
+                write!(f, "Multiple session-names in line {line}")
             }
             #[allow(deprecated)]
             ParserError::NoSessionName => write!(f, "No session-name line"),
             ParserError::MultipleSessionDescription(line) => {
-                write!(f, "Multiple session-information in line {}", line)
+                write!(f, "Multiple session-information in line {line}")
             }
-            ParserError::MultipleUris(line) => write!(f, "Multiple URIs in line {}", line),
+            ParserError::MultipleUris(line) => write!(f, "Multiple URIs in line {line}"),
             ParserError::MultipleConnections(line) => {
-                write!(f, "Multiple connections in line {}", line)
+                write!(f, "Multiple connections in line {line}")
             }
-            ParserError::MultipleTimeZones(line) => write!(f, "Multiple zones in line {}", line),
+            ParserError::MultipleTimeZones(line) => write!(f, "Multiple zones in line {line}"),
             ParserError::MultipleMediaTitles(line) => {
-                write!(f, "Multiple media titles in line {}", line)
+                write!(f, "Multiple media titles in line {line}")
             }
-            ParserError::MultipleKeys(line) => write!(f, "Multiple keys in line {}", line),
+            ParserError::MultipleKeys(line) => write!(f, "Multiple keys in line {line}"),
         }
     }
 }

src/writer.rs

@@ -6,15 +6,15 @@ use super::*;
 
 fn format_time<W: std::io::Write>(w: &mut W, t: u64) -> Result<(), std::io::Error> {
     if t == 0 {
-        write!(w, "{}", t)?;
+        write!(w, "{t}")?;
     } else if t % 86_400 == 0 {
         write!(w, "{}d", t / 86_400)?;
     } else if t % 3_600 == 0 {
         write!(w, "{}h", t / 3_600)?;
     } else if t % 60 == 0 {
         write!(w, "{}m", t / 60)?;
     } else {
-        write!(w, "{}", t)?;
+        write!(w, "{t}")?;
     }
 
     Ok(())
@@ -147,12 +147,12 @@ impl Media {
         write!(w, "m={media} {port}", media = self.media, port = self.port)?;
 
         if let Some(ref num_ports) = self.num_ports {
-            write!(w, "/{}", num_ports)?;
+            write!(w, "/{num_ports}")?;
         }
         writeln!(w, " {} {}\r", self.proto, self.fmt)?;
 
         if let Some(ref media_title) = self.media_title {
-            writeln!(w, "i={media_title}\r", media_title = media_title)?;
+            writeln!(w, "i={media_title}\r")?;
         }
 
         for connection in &self.connections {
@@ -183,23 +183,19 @@ impl Session {
         writeln!(w, "s={session_name}\r", session_name = self.session_name)?;
 
         if let Some(ref session_description) = self.session_description {
-            writeln!(
-                w,
-                "i={session_description}\r",
-                session_description = session_description
-            )?;
+            writeln!(w, "i={session_description}\r")?;
         }
 
         if let Some(ref uri) = self.uri {
-            writeln!(w, "u={uri}\r", uri = uri)?;
+            writeln!(w, "u={uri}\r")?;
         }
 
         for email in &self.emails {
-            writeln!(w, "e={email}\r", email = email)?;
+            writeln!(w, "e={email}\r")?;
         }
 
         for phone in &self.phones {
-            writeln!(w, "p={phone}\r", phone = phone)?;
+            writeln!(w, "p={phone}\r")?;
         }
 
         if let Some(ref connection) = self.connection {