Merge pull request feed-rs#253 from feed-rs/clippy-and-fmt

Fix clippy and fmt warnings
wathiede · Dec 8, 2024 · 1211d45 · 1211d45
2 parents c861b11 + dbab1a9
commit 1211d45
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 22 deletions.
diff --git a/feed-rs/src/parser/atom/mod.rs b/feed-rs/src/parser/atom/mod.rs
@@ -54,9 +54,15 @@ pub(crate) fn parse_feed<R: BufRead>(parser: &Parser, root: Element<R>) -> Parse
     }
 
     if parser.sanitize_content {
-        if let Some(t) = feed.description.as_mut() { t.sanitize() }
-        if let Some(t) = feed.rights.as_mut() { t.sanitize() }
-        if let Some(t) = feed.title.as_mut() { t.sanitize() }
+        if let Some(t) = feed.description.as_mut() {
+            t.sanitize()
+        }
+        if let Some(t) = feed.rights.as_mut() {
+            t.sanitize()
+        }
+        if let Some(t) = feed.title.as_mut() {
+            t.sanitize()
+        }
     }
 
     Ok(feed)
@@ -238,10 +244,18 @@ fn handle_entry<R: BufRead>(parser: &Parser, element: Element<R>) -> ParseFeedRe
     }
 
     if parser.sanitize_content {
-        if let Some(c) = entry.content.as_mut() { c.sanitize() }
-        if let Some(t) = entry.rights.as_mut() { t.sanitize() }
-        if let Some(t) = entry.summary.as_mut() { t.sanitize() }
-        if let Some(t) = entry.title.as_mut() { t.sanitize() }
+        if let Some(c) = entry.content.as_mut() {
+            c.sanitize()
+        }
+        if let Some(t) = entry.rights.as_mut() {
+            t.sanitize()
+        }
+        if let Some(t) = entry.summary.as_mut() {
+            t.sanitize()
+        }
+        if let Some(t) = entry.title.as_mut() {
+            t.sanitize()
+        }
     }
 
     // If a media:content or media:thumbnail item was found in this entry, then attach it

diff --git a/feed-rs/src/parser/json/mod.rs b/feed-rs/src/parser/json/mod.rs
@@ -154,7 +154,9 @@ fn handle_item(parser: &Parser, ji: JsonItem) -> Entry {
     // as such when sanitizing, we will *only* inspect entry.content.
     // it's "text/html".
     if parser.sanitize_content {
-        if let Some(c) = entry.content.as_mut() { c.sanitize() }
+        if let Some(c) = entry.content.as_mut() {
+            c.sanitize()
+        }
     }
 
     entry

diff --git a/feed-rs/src/parser/rss1/mod.rs b/feed-rs/src/parser/rss1/mod.rs
@@ -54,9 +54,15 @@ fn handle_channel<R: BufRead>(parser: &Parser, feed: &mut Feed, channel: Element
     }
 
     if parser.sanitize_content {
-        if let Some(t) = feed.description.as_mut() { t.sanitize() }
-        if let Some(t) = feed.rights.as_mut() { t.sanitize() }
-        if let Some(t) = feed.title.as_mut() { t.sanitize() }
+        if let Some(t) = feed.description.as_mut() {
+            t.sanitize()
+        }
+        if let Some(t) = feed.rights.as_mut() {
+            t.sanitize()
+        }
+        if let Some(t) = feed.title.as_mut() {
+            t.sanitize()
+        }
     }
 
     Ok(())
@@ -135,10 +141,18 @@ fn handle_item<R: BufRead>(parser: &Parser, element: Element<R>) -> ParseFeedRes
     }
 
     if parser.sanitize_content {
-        if let Some(c) = entry.content.as_mut() { c.sanitize() }
-        if let Some(t) = entry.rights.as_mut() { t.sanitize() }
-        if let Some(t) = entry.summary.as_mut() { t.sanitize() }
-        if let Some(t) = entry.title.as_mut() { t.sanitize() }
+        if let Some(c) = entry.content.as_mut() {
+            c.sanitize()
+        }
+        if let Some(t) = entry.rights.as_mut() {
+            t.sanitize()
+        }
+        if let Some(t) = entry.summary.as_mut() {
+            t.sanitize()
+        }
+        if let Some(t) = entry.title.as_mut() {
+            t.sanitize()
+        }
     }
 
     // If we found at least 1 link

diff --git a/feed-rs/src/parser/rss2/mod.rs b/feed-rs/src/parser/rss2/mod.rs
@@ -74,9 +74,15 @@ fn handle_channel<R: BufRead>(parser: &Parser, channel: Element<R>) -> ParseFeed
     }
 
     if parser.sanitize_content {
-        if let Some(t) = feed.description.as_mut() { t.sanitize() }
-        if let Some(t) = feed.rights.as_mut() { t.sanitize() }
-        if let Some(t) = feed.title.as_mut() { t.sanitize() }
+        if let Some(t) = feed.description.as_mut() {
+            t.sanitize()
+        }
+        if let Some(t) = feed.rights.as_mut() {
+            t.sanitize()
+        }
+        if let Some(t) = feed.title.as_mut() {
+            t.sanitize()
+        }
     }
 
     Ok(feed)
@@ -251,10 +257,18 @@ fn handle_item<R: BufRead>(parser: &Parser, element: Element<R>) -> ParseFeedRes
     }
 
     if parser.sanitize_content {
-        if let Some(c) = entry.content.as_mut() { c.sanitize() }
-        if let Some(t) = entry.rights.as_mut() { t.sanitize() }
-        if let Some(t) = entry.summary.as_mut() { t.sanitize() }
-        if let Some(t) = entry.title.as_mut() { t.sanitize() }
+        if let Some(c) = entry.content.as_mut() {
+            c.sanitize()
+        }
+        if let Some(t) = entry.rights.as_mut() {
+            t.sanitize()
+        }
+        if let Some(t) = entry.summary.as_mut() {
+            t.sanitize()
+        }
+        if let Some(t) = entry.title.as_mut() {
+            t.sanitize()
+        }
     }
 
     // If a media:content item with content exists, then emit it

diff --git a/feed-rs/src/xml/mod.rs b/feed-rs/src/xml/mod.rs
@@ -349,6 +349,8 @@ pub(crate) struct Element<'a, R: BufRead> {
     source: &'a ElementSource<R>,
 }
 
+// TODO this is flagged as needless, but is required in Element... fix this
+#[allow(clippy::needless_lifetimes)]
 impl<'a, R: BufRead> Element<'a, R> {
     /// Returns the value for an attribute if it exists
     pub(crate) fn attr_value(&self, name: &str) -> Option<String> {
@@ -385,6 +387,8 @@ impl<'a, R: BufRead> Element<'a, R> {
     }
 }
 
+// TODO this is flagged as needless, but is required in Element... fix this
+#[allow(clippy::needless_lifetimes)]
 impl<'a, R: BufRead> Debug for Element<'a, R> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut buffer = String::new();