From c1d3d4f2854c33076ae34ca2f7f769cf15a0478a Mon Sep 17 00:00:00 2001 From: quambene Date: Mon, 22 Jan 2024 02:23:41 +0100 Subject: [PATCH] Fix clippy warnings --- src/bookmark_reader/target_reader.rs | 3 +-- src/bookmarks/bookmark_processor.rs | 2 +- src/bookmarks/target_bookmarks.rs | 10 +++++----- src/cmd/fetch.rs | 2 +- src/cmd/remove.rs | 2 +- src/html.rs | 2 +- src/settings.rs | 4 ++-- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/bookmark_reader/target_reader.rs b/src/bookmark_reader/target_reader.rs index 425eab1..ff66b8c 100644 --- a/src/bookmark_reader/target_reader.rs +++ b/src/bookmark_reader/target_reader.rs @@ -37,8 +37,7 @@ fn convert_underlyings(target_bookmarks: &mut TargetBookmarks) -> Result<(), Bog if bookmark .sources .iter() - .find(|source| matches!(source, SourceType::Underlying(_))) - .is_some() + .any(|source| matches!(source, SourceType::Underlying(_))) { Some(bookmark.clone()) } else { diff --git a/src/bookmarks/bookmark_processor.rs b/src/bookmarks/bookmark_processor.rs index 1a298d7..c0d5c3c 100644 --- a/src/bookmarks/bookmark_processor.rs +++ b/src/bookmarks/bookmark_processor.rs @@ -174,7 +174,7 @@ where let cache = &self.cache; if bookmark.underlying_url.is_none() { - let underlying_url = html::select_underlying(&website, &bookmark.underlying_type)?; + let underlying_url = html::select_underlying(website, &bookmark.underlying_type)?; if let Some(underlying_url) = underlying_url { bookmark.underlying_url = Some(underlying_url.clone()); diff --git a/src/bookmarks/target_bookmarks.rs b/src/bookmarks/target_bookmarks.rs index 50a3744..800001e 100644 --- a/src/bookmarks/target_bookmarks.rs +++ b/src/bookmarks/target_bookmarks.rs @@ -239,7 +239,7 @@ impl TargetBookmarks { ) -> Vec<&'a mut TargetBookmark> { self.0 .iter_mut() - .filter(|(url, _)| !source_bookmarks.contains_key(&url.to_string())) + .filter(|(url, _)| !source_bookmarks.contains_key(url.as_str())) .map(|(_, target_bookmark)| target_bookmark) .collect() } @@ -383,19 +383,19 @@ mod tests { let source_bookmarks = SourceBookmarks::new(HashMap::from_iter([ ( url1.to_string(), - SourceBookmarkBuilder::new(&url1.to_string()).build(), + SourceBookmarkBuilder::new(url1.as_str()).build(), ), ( url2.to_string(), - SourceBookmarkBuilder::new(&url2.to_string()).build(), + SourceBookmarkBuilder::new(url2.as_str()).build(), ), ( url3.to_string(), - SourceBookmarkBuilder::new(&url3.to_string()).build(), + SourceBookmarkBuilder::new(url3.as_str()).build(), ), ( url4.to_string(), - SourceBookmarkBuilder::new(&url4.to_string()).build(), + SourceBookmarkBuilder::new(url4.as_str()).build(), ), ])); let mut target_bookmarks = TargetBookmarks::new(HashMap::from_iter([ diff --git a/src/cmd/fetch.rs b/src/cmd/fetch.rs index 58133a6..8b2e565 100644 --- a/src/cmd/fetch.rs +++ b/src/cmd/fetch.rs @@ -25,7 +25,7 @@ pub async fn fetch(config: &Config, args: &FetchArgs) -> Result<(), anyhow::Erro fetch_bookmarks( &config.settings, - &args, + args, client, cache, &mut target_reader, diff --git a/src/cmd/remove.rs b/src/cmd/remove.rs index 3dc794b..6de9c33 100644 --- a/src/cmd/remove.rs +++ b/src/cmd/remove.rs @@ -43,7 +43,7 @@ fn remove_urls( target_reader.read(&mut target_bookmarks)?; for url in urls { - if target_bookmarks.remove(&url).is_some() { + if target_bookmarks.remove(url).is_some() { counter += 1; } } diff --git a/src/html.rs b/src/html.rs index 2dffcc2..a616301 100644 --- a/src/html.rs +++ b/src/html.rs @@ -98,7 +98,7 @@ fn is_filtered_tag(tag_name: &QualName) -> bool { pub fn convert_to_text(html: &str, bookmark_url: &Url) -> Result { let mut cursor = Cursor::new(html); let product = - extractor::extract(&mut cursor, &bookmark_url).map_err(BogrepError::ConvertHtml)?; + extractor::extract(&mut cursor, bookmark_url).map_err(BogrepError::ConvertHtml)?; Ok(product.text) } diff --git a/src/settings.rs b/src/settings.rs index a475171..65bba71 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -119,7 +119,7 @@ impl Settings { } pub fn add_ignored_url(&mut self, url: &str) -> Result<(), anyhow::Error> { - let url = Url::parse(&url).context(format!("Invalid url {url}"))?; + let url = Url::parse(url).context(format!("Invalid url {url}"))?; let normalized_url = url.to_string(); if self.ignored_urls.iter().any(|url| *url == normalized_url) { @@ -132,7 +132,7 @@ impl Settings { } pub fn add_underlying_url(&mut self, url: &str) -> Result<(), anyhow::Error> { - let url = Url::parse(&url).context(format!("Invalid url {url}"))?; + let url = Url::parse(url).context(format!("Invalid url {url}"))?; let normalized_url = url.to_string(); let domain = url.domain().ok_or(anyhow!(format!("Invalid url {url}")))?;