Clippy fixes.

diff --git a/crates/apub/src/collections/community_moderators.rs b/crates/apub/src/collections/community_moderators.rs
index 52825482662cdee498696a6cbf182b3b6e201ee6..b0182bdf2e1fb27502e7f8da5f7ae04d1c2c5a1a 100644 (file)
--- a/crates/apub/src/collections/community_moderators.rs
+++ b/crates/apub/src/collections/community_moderators.rs
@@ -41,7 +41,7 @@ impl ApubObject for ApubCommunityModerators {
         CommunityModeratorView::for_community(conn, cid)
       })
       .await??;
-      Ok(Some(ApubCommunityModerators { 0: moderators }))
+      Ok(Some(ApubCommunityModerators(moderators)))
     } else {
       Ok(None)
     }
@@ -131,7 +131,7 @@ impl ApubObject for ApubCommunityModerators {
     }
 
     // This return value is unused, so just set an empty vec
-    Ok(ApubCommunityModerators { 0: vec![] })
+    Ok(ApubCommunityModerators(Vec::new()))
   }
 
   type DbType = ();

diff --git a/crates/apub/src/collections/community_outbox.rs b/crates/apub/src/collections/community_outbox.rs
index 3b4c8534d6cd4132ceb09a34719591a09c6fb79a..f33034061cffb2381a131db52a24f3e770e4e13b 100644 (file)
--- a/crates/apub/src/collections/community_outbox.rs
+++ b/crates/apub/src/collections/community_outbox.rs
@@ -116,7 +116,7 @@ impl ApubObject for ApubCommunityOutbox {
     }
 
     // This return value is unused, so just set an empty vec
-    Ok(ApubCommunityOutbox { 0: vec![] })
+    Ok(ApubCommunityOutbox(Vec::new()))
   }
 
   type DbType = ();

diff --git a/crates/apub/src/fetcher/webfinger.rs b/crates/apub/src/fetcher/webfinger.rs
index 918e1de0fe393a2b615325f86ef5e5c3c173db68..e2370c329819e086c6578204666a18585382f031 100644 (file)
--- a/crates/apub/src/fetcher/webfinger.rs
+++ b/crates/apub/src/fetcher/webfinger.rs
@@ -73,8 +73,7 @@ where
         false
       }
     })
-    .map(|l| l.href.clone())
-    .flatten()
+    .filter_map(|l| l.href.clone())
     .collect();
   for l in links {
     let object = ObjectId::<Kind>::new(l)

diff --git a/crates/apub/src/objects/comment.rs b/crates/apub/src/objects/comment.rs
index bc8caceaa9ae7662ba65a4ba526a9ec6ffa5f7e0..c622c14dd78ef278754388b0f2091228423708c2 100644 (file)
--- a/crates/apub/src/objects/comment.rs
+++ b/crates/apub/src/objects/comment.rs
@@ -47,7 +47,7 @@ impl Deref for ApubComment {
 
 impl From<Comment> for ApubComment {
   fn from(c: Comment) -> Self {
-    ApubComment { 0: c }
+    ApubComment(c)
   }
 }
 

diff --git a/crates/apub/src/objects/community.rs b/crates/apub/src/objects/community.rs
index eb9cb218b0d296cde2de3758fa98331491a4d95a..bbb239cb57a949a4c99b982ce3eb6ca317b81fc6 100644 (file)
--- a/crates/apub/src/objects/community.rs
+++ b/crates/apub/src/objects/community.rs
@@ -41,7 +41,7 @@ impl Deref for ApubCommunity {
 
 impl From<Community> for ApubCommunity {
   fn from(c: Community) -> Self {
-    ApubCommunity { 0: c }
+    ApubCommunity(c)
   }
 }
 

diff --git a/crates/apub/src/objects/instance.rs b/crates/apub/src/objects/instance.rs
index 9968b81e1072e8b7bfeda278a11c022a108e6fdd..af75812dacfc406e79da3c21d30eabe92e840d69 100644 (file)
--- a/crates/apub/src/objects/instance.rs
+++ b/crates/apub/src/objects/instance.rs
@@ -37,7 +37,7 @@ impl Deref for ApubSite {
 
 impl From<Site> for ApubSite {
   fn from(s: Site) -> Self {
-    ApubSite { 0: s }
+    ApubSite(s)
   }
 }
 

diff --git a/crates/apub/src/objects/person.rs b/crates/apub/src/objects/person.rs
index a903d5a65f6528cd82d7b8f3cdd7f10b6e7c40ea..a6133ed47f9df6fd0a7dd1ae1f7e7e5417c7af03 100644 (file)
--- a/crates/apub/src/objects/person.rs
+++ b/crates/apub/src/objects/person.rs
@@ -47,7 +47,7 @@ impl Deref for ApubPerson {
 
 impl From<DbPerson> for ApubPerson {
   fn from(p: DbPerson) -> Self {
-    ApubPerson { 0: p }
+    ApubPerson(p)
   }
 }
 

diff --git a/crates/apub/src/objects/post.rs b/crates/apub/src/objects/post.rs
index d5309dc177f8c2e42a54f3cc0117786e26aad244..dbea0349c077c3e77fe7df403d7b63bc2526479f 100644 (file)
--- a/crates/apub/src/objects/post.rs
+++ b/crates/apub/src/objects/post.rs
@@ -50,7 +50,7 @@ impl Deref for ApubPost {
 
 impl From<Post> for ApubPost {
   fn from(p: Post) -> Self {
-    ApubPost { 0: p }
+    ApubPost(p)
   }
 }
 

diff --git a/crates/apub/src/objects/private_message.rs b/crates/apub/src/objects/private_message.rs
index 6f445184a4d3b375c536d20b7b605225054d43c4..04974b802203e7c1f77c042e8eb06fe426ae8f2c 100644 (file)
--- a/crates/apub/src/objects/private_message.rs
+++ b/crates/apub/src/objects/private_message.rs
@@ -40,7 +40,7 @@ impl Deref for ApubPrivateMessage {
 
 impl From<PrivateMessage> for ApubPrivateMessage {
   fn from(pm: PrivateMessage) -> Self {
-    ApubPrivateMessage { 0: pm }
+    ApubPrivateMessage(pm)
   }
 }
 

diff --git a/crates/db_schema/src/lib.rs b/crates/db_schema/src/lib.rs
index 5388d37c2b8a172d76e7213ddde81a4906d444e1..724fffcd4d756d9de52d98562f2f28ba486d1418 100644 (file)
--- a/crates/db_schema/src/lib.rs
+++ b/crates/db_schema/src/lib.rs
@@ -65,11 +65,11 @@ pub enum SearchType {
 }
 
 pub fn from_opt_str_to_opt_enum<T: std::str::FromStr>(opt: &Option<String>) -> Option<T> {
-  opt.as_ref().map(|t| T::from_str(t).ok()).flatten()
+  opt.as_ref().and_then(|t| T::from_str(t).ok())
 }
 
 pub fn fuzzy_search(q: &str) -> String {
-  let replaced = q.replace("%", "\\%").replace("_", "\\_").replace(" ", "%");
+  let replaced = q.replace('%', "\\%").replace('_', "\\_").replace(' ', "%");
   format!("%{}%", replaced)
 }
 

diff --git a/crates/db_views/src/comment_report_view.rs b/crates/db_views/src/comment_report_view.rs
index 68c000271e72dda103f12c7a230207ab164fb119..63701db93707637fc5a21d845f37dd0ec3bc2f4e 100644 (file)
--- a/crates/db_views/src/comment_report_view.rs
+++ b/crates/db_views/src/comment_report_view.rs
@@ -120,11 +120,7 @@ impl CommentReportView {
       ))
       .first::<CommentReportViewTuple>(conn)?;
 
-    let my_vote = if comment_like.is_none() {
-      None
-    } else {
-      comment_like
-    };
+    let my_vote = comment_like;
 
     Ok(Self {
       comment_report,

diff --git a/crates/db_views/src/post_report_view.rs b/crates/db_views/src/post_report_view.rs
index e8532a916c5d5506d3a4722e5403744afbc05ee7..66341d67bf8197e54e3583baa5d53b595c3c3cca 100644 (file)
--- a/crates/db_views/src/post_report_view.rs
+++ b/crates/db_views/src/post_report_view.rs
@@ -111,7 +111,7 @@ impl PostReportView {
       ))
       .first::<PostReportViewTuple>(conn)?;
 
-    let my_vote = if post_like.is_none() { None } else { post_like };
+    let my_vote = post_like;
 
     Ok(Self {
       post_report,

diff --git a/crates/routes/src/feeds.rs b/crates/routes/src/feeds.rs
index 8fee239597851944204f74ed51eaea3c825a0eb2..bfe49fbdb81a0c595db9be0e40b211344c70185b 100644 (file)
--- a/crates/routes/src/feeds.rs
+++ b/crates/routes/src/feeds.rs
@@ -373,7 +373,7 @@ fn build_item(
   i.guid(guid);
   i.link(url.to_owned());
   // TODO add images
-  let html = markdown_to_html(&content.to_string());
+  let html = markdown_to_html(content);
   i.description(html);
   Ok(i.build())
 }

diff --git a/crates/routes/src/webfinger.rs b/crates/routes/src/webfinger.rs
index b315537937f9261459bc7b39b7155dbd9fccbf94..a95902b270baad0e7230f74517181c328a4105f5 100644 (file)
--- a/crates/routes/src/webfinger.rs
+++ b/crates/routes/src/webfinger.rs
@@ -39,8 +39,7 @@ async fn get_webfinger_response(
     .settings()
     .webfinger_regex()
     .captures(&info.resource)
-    .map(|c| c.get(1))
-    .flatten()
+    .and_then(|c| c.get(1))
     .context(location_info!())?
     .as_str()
     .to_string();

diff --git a/crates/utils/src/request.rs b/crates/utils/src/request.rs
index 1e4f4bf3c2a3d2e4dec9545c2d3172f55a52d53e..c0593ffa1406074591b0fa627f68facb1256a7ad 100644 (file)
--- a/crates/utils/src/request.rs
+++ b/crates/utils/src/request.rs
@@ -138,8 +138,7 @@ fn html_to_site_metadata(html_bytes: &[u8]) -> Result<SiteMetadata, LemmyError>
     .opengraph
     .images
     .get(0)
-    .map(|ogo| Url::parse(&ogo.url).ok())
-    .flatten();
+    .and_then(|ogo| Url::parse(&ogo.url).ok());
 
   let title = og_title.or(page_title);
   let description = og_description.or(page_description);

diff --git a/src/scheduled_tasks.rs b/src/scheduled_tasks.rs
index 23c4fdc4ac096ed0d0ba3ad9e91bc343d40a46c0..30e553b5683877b8df949198acde50e0cbe84bd6 100644 (file)
--- a/src/scheduled_tasks.rs
+++ b/src/scheduled_tasks.rs
@@ -98,7 +98,7 @@ fn active_counts(conn: &PgConnection) {
 fn update_banned_when_expired(conn: &PgConnection) {
   info!("Updating banned column if it expires ...");
   let update_ban_expires_stmt =
-    format!("update person set banned = false where banned = true and ban_expires < now()");
+    "update person set banned = false where banned = true and ban_expires < now()";
   sql_query(update_ban_expires_stmt)
     .execute(conn)
     .expect("update banned when expires");