fmt, clippy

src/debian/changelog.rs

@@ -56,9 +56,13 @@ pub fn parse_changelog_entry(path: &Path) -> Result<ChangelogEntry, Box<dyn std:
         }
     };
 
-    let open = header
-        .find('(')
-        .ok_or_else(|| format!("invalid changelog header in '{}': {}", path.display(), header))?;
+    let open = header.find('(').ok_or_else(|| {
+        format!(
+            "invalid changelog header in '{}': {}",
+            path.display(),
+            header
+        )
+    })?;
     let close = header[open..]
         .find(')')
         .ok_or_else(|| format!("unbalanced parenthesis in changelog header '{}'", header))?;

src/debian/control.rs

@@ -90,17 +90,16 @@ pub fn parse_paragraphs(input: &str) -> Vec<Paragraph> {
         // Continuation line
         if line.starts_with(' ') || line.starts_with('\t') {
             let content = line.strip_prefix(' ').unwrap_or(line);
-            if let Some(field) = &last_field {
-                if let Some((_, v)) = current
+            if let Some(field) = &last_field
+                && let Some((_, v)) = current
                     .fields
                     .iter_mut()
                     .rev()
                     .find(|(k, _)| k.eq_ignore_ascii_case(field))
-                {
-                    v.push('\n');
-                    v.push_str(content);
-                    continue;
-                }
+            {
+                v.push('\n');
+                v.push_str(content);
+                continue;
             }
             // Continuation without a preceding field line: skip it (malformed)
             continue;
@@ -174,7 +173,7 @@ mod tests {
     #[test]
     fn parse_multiline_and_comments() {
         let input = "# a comment\nDescription: short\n long description\n" //
-            .to_string() //
+            .to_string()
             + " spanning lines\n\nPackage: x\n";
         let paras = parse_paragraphs(&input);
         assert_eq!(paras.len(), 2);
@@ -190,7 +189,10 @@ mod tests {
         let mut p = Paragraph::new();
         p.set("Description", value);
         let text = write_paragraph(&p);
-        assert_eq!(text, "Description: short\n long description\n spanning lines\n");
+        assert_eq!(
+            text,
+            "Description: short\n long description\n spanning lines\n"
+        );
         let reparsed = parse_paragraphs(&text);
         assert_eq!(reparsed[0].get("Description"), Some(value));
     }
@@ -228,12 +230,15 @@ impl ControlInfo {
     pub fn parse(path: &Path) -> Result<ControlInfo, Box<dyn std::error::Error>> {
         let content = std::fs::read_to_string(path)
             .map_err(|e| format!("failed to read control file '{}': {}", path.display(), e))?;
-        Self::from_str(&content)
+        content
+            .parse::<ControlInfo>()
             .map_err(|e| format!("invalid control file '{}': {}", path.display(), e).into())
     }
 
     /// Parse control content from a string.
-    pub fn from_str(content: &str) -> Result<ControlInfo, String> {
+    ///
+    /// Prefer [`std::str::FromStr`] (`"...".parse::<ControlInfo>()`).
+    pub fn parse_content(content: &str) -> Result<ControlInfo, String> {
         let paragraphs = parse_paragraphs(content);
         let mut iter = paragraphs.into_iter();
         let source = iter
@@ -267,9 +272,18 @@ impl ControlInfo {
     }
 }
 
+impl std::str::FromStr for ControlInfo {
+    type Err = String;
+
+    fn from_str(content: &str) -> Result<Self, Self::Err> {
+        ControlInfo::parse_content(content)
+    }
+}
+
 #[cfg(test)]
 mod control_info_tests {
     use super::*;
+    use std::str::FromStr;
 
     #[test]
     fn control_parsing() {

src/debian/files.rs

@@ -61,8 +61,11 @@ pub fn parse_filename(name: &str) -> Option<FilesEntry> {
         if let Some(dot) = rest.rfind('.') {
             let arch = &rest[..dot];
             let ptype = &rest[dot + 1..];
-            let valid = |s: &str| !s.is_empty()
-                && s.chars().all(|c| c.is_ascii_alphanumeric() || "-+.:~".contains(c));
+            let valid = |s: &str| {
+                !s.is_empty()
+                    && s.chars()
+                        .all(|c| c.is_ascii_alphanumeric() || "-+.:~".contains(c))
+            };
             if valid(pkg) && valid(version) && valid(arch) && valid(ptype) {
                 return Some(FilesEntry {
                     filename: name.to_string(),
@@ -128,7 +131,11 @@ impl FilesList {
                 return Err(format!("badly formed line in '{}': {}", path.display(), line).into());
             }
             let mut entry = parse_filename(tokens[0]).ok_or_else(|| {
-                format!("badly formed file name in '{}': {}", path.display(), tokens[0])
+                format!(
+                    "badly formed file name in '{}': {}",
+                    path.display(),
+                    tokens[0]
+                )
             })?;
             entry.section = tokens[1].to_string();
             entry.priority = tokens[2].to_string();

src/debian/mod.rs

@@ -15,8 +15,8 @@ pub mod control;
 pub mod files;
 pub mod version;
 
-pub use changelog::{parse_changelog_entry, ChangelogEntry};
+pub use changelog::{ChangelogEntry, parse_changelog_entry};
 pub use checksums::{Entry as ChecksumEntry, FileChecksums};
-pub use control::{parse_paragraphs, write_paragraph, ControlInfo, Paragraph};
+pub use control::{ControlInfo, Paragraph, parse_paragraphs, write_paragraph};
 pub use files::{FilesEntry, FilesList};
 pub use version::DebianVersion;