From af8fe176ea3f054fa60547bca43893e58fb75fff Mon Sep 17 00:00:00 2001 From: Matthew Esposito Date: Wed, 19 Apr 2023 10:37:47 -0400 Subject: [PATCH] Fix clippy warnings --- src/post.rs | 28 ++++++++++++++-------------- src/utils.rs | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/post.rs b/src/post.rs index aa06b09..0f97b2e 100644 --- a/src/post.rs +++ b/src/post.rs @@ -72,7 +72,7 @@ pub async fn item(req: Request) -> Result, String> { } let query = match COMMENT_SEARCH_CAPTURE.captures(&url) { - Some(captures) => captures.get(1).unwrap().as_str().replace("%20", " ").replace("+", " "), + Some(captures) => captures.get(1).unwrap().as_str().replace("%20", " ").replace('+', " "), None => String::new(), }; @@ -154,7 +154,7 @@ fn query_comments( results } - +#[allow(clippy::too_many_arguments)] fn build_comment( comment: &serde_json::Value, data: &serde_json::Value, @@ -165,15 +165,15 @@ fn build_comment( filters: &HashSet, req: &Request, ) -> Comment { - let id = val(&comment, "id"); + let id = val(comment, "id"); - let body = if (val(&comment, "author") == "[deleted]" && val(&comment, "body") == "[removed]") || val(&comment, "body") == "[ Removed by Reddit ]" { + let body = if (val(comment, "author") == "[deleted]" && val(comment, "body") == "[removed]") || val(comment, "body") == "[ Removed by Reddit ]" { format!( "

[removed] — view removed comment

", post_link, id ) } else { - rewrite_urls(&val(&comment, "body_html")) + rewrite_urls(&val(comment, "body_html")) }; let kind = comment["kind"].as_str().unwrap_or_default().to_string(); @@ -193,24 +193,24 @@ fn build_comment( let awards: Awards = Awards::parse(&data["all_awardings"]); - let parent_kind_and_id = val(&comment, "parent_id"); + let parent_kind_and_id = val(comment, "parent_id"); let parent_info = parent_kind_and_id.split('_').collect::>(); let highlighted = id == highlighted_comment; let author = Author { - name: val(&comment, "author"), + name: val(comment, "author"), flair: Flair { flair_parts: FlairPart::parse( data["author_flair_type"].as_str().unwrap_or_default(), data["author_flair_richtext"].as_array(), data["author_flair_text"].as_str(), ), - text: val(&comment, "link_flair_text"), - background_color: val(&comment, "author_flair_background_color"), - foreground_color: val(&comment, "author_flair_text_color"), + text: val(comment, "link_flair_text"), + background_color: val(comment, "author_flair_background_color"), + foreground_color: val(comment, "author_flair_text_color"), }, - distinguished: val(&comment, "distinguished"), + distinguished: val(comment, "distinguished"), }; let is_filtered = filters.contains(&["u_", author.name.as_str()].concat()); @@ -222,7 +222,7 @@ fn build_comment( let is_stickied = data["stickied"].as_bool().unwrap_or_default(); let collapsed = (is_moderator_comment && is_stickied) || is_filtered; - return Comment { + Comment { id, kind, parent_id: parent_info[1].to_string(), @@ -245,6 +245,6 @@ fn build_comment( collapsed, is_filtered, more_count, - prefs: Preferences::new(&req), - }; + prefs: Preferences::new(req), + } } diff --git a/src/utils.rs b/src/utils.rs index 1a7e011..62a71ed 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -965,9 +965,9 @@ pub fn sfw_only() -> bool { } // Determines if a request shoud redirect to a nsfw landing gate. -pub fn should_be_nsfw_gated(req: &Request, req_url: &String) -> bool { +pub fn should_be_nsfw_gated(req: &Request, req_url: &str) -> bool { let sfw_instance = sfw_only(); - let gate_nsfw = (setting(&req, "show_nsfw") != "on") || sfw_instance; + let gate_nsfw = (setting(req, "show_nsfw") != "on") || sfw_instance; // Nsfw landing gate should not be bypassed on a sfw only instance, let bypass_gate = !sfw_instance && req_url.contains("&bypass_nsfw_landing");