fix or deal with all clippy lints

Author: delan

src/attachments.rs

@@ -160,12 +160,12 @@ fn cached_attachment_url(id: &str, dir: &AttachmentsPath) -> eyre::Result<Attach
         bail!("directory is empty: {path:?}");
     };
 
-    Ok(path.join_dir_entry(&entry?)?)
+    path.join_dir_entry(&entry?)
 }
 
 fn cache_imported_attachment(url: &str, path: &AttachmentsPath) -> eyre::Result<AttachmentsPath> {
     // if the attachment id directory exists...
-    if let Ok(mut entries) = read_dir(&path) {
+    if let Ok(mut entries) = read_dir(path) {
         // and the directory contains a file...
         if let Some(entry) = entries.next() {
             // and we can open the file...

src/command/attach.rs

@@ -25,7 +25,7 @@ pub async fn main() -> eyre::Result<()> {
     create_dir_all(&*ATTACHMENTS_PATH_ROOT)?;
 
     for path in args.paths {
-        let attachment_path = RealAttachmentsContext.store(&Path::new(&path))?;
+        let attachment_path = RealAttachmentsContext.store(Path::new(&path))?;
         info!(
             "created attachment: <{}>",
             attachment_path.site_path()?.base_relative_url()

src/command/cohost2autost.rs

@@ -115,7 +115,7 @@ fn convert_chost(entry: &DirEntry, context: &dyn AttachmentsContext) -> eyre::Re
     }
 
     for (shared_post, output_path) in shared_posts.into_iter().zip(shared_post_filenames.iter()) {
-        convert_single_chost(shared_post, vec![], &output_path, context)?;
+        convert_single_chost(shared_post, vec![], output_path, context)?;
     }
 
     let output_path = PostsPath::generated_post_path(post_id);
@@ -173,7 +173,7 @@ fn convert_single_chost(
         // posts in the cohost api provide an `astMap` that contains the perfect rendering of
         // markdown blocks. since our own markdown rendering is far from perfect, we use their
         // rendering instead of our own when available.
-        while spans.front().map_or(false, |(_ast, _start, end)| i >= *end) {
+        while spans.front().is_some_and(|(_ast, _start, end)| i >= *end) {
             spans.pop_front();
         }
         if let Some((ast, start, end)) = match spans.front() {
@@ -504,7 +504,7 @@ fn process_chost_fragment(
         Ok(())
     })? {}
 
-    Ok(serialize_html_fragment(dom)?)
+    serialize_html_fragment(dom)
 }
 
 #[test]
@@ -530,21 +530,21 @@ fn test_render_markdown_block() -> eyre::Result<()> {
             cacheable: &Cacheable,
         ) -> eyre::Result<CachedFileResult<AttachmentsPath>> {
             Ok(CachedFileResult::CachedPath(match cacheable {
-                Cacheable::Attachment { id, .. } => ATTACHMENTS_PATH_ROOT.join(&format!("{id}"))?,
+                Cacheable::Attachment { id, .. } => ATTACHMENTS_PATH_ROOT.join(id)?,
                 Cacheable::Static { filename, .. } => {
-                    ATTACHMENTS_PATH_COHOST_STATIC.join(&format!("{filename}"))?
+                    ATTACHMENTS_PATH_COHOST_STATIC.join(filename)?
                 }
                 Cacheable::Avatar { filename, .. } => {
-                    ATTACHMENTS_PATH_COHOST_AVATAR.join(&format!("{filename}"))?
+                    ATTACHMENTS_PATH_COHOST_AVATAR.join(filename)?
                 }
                 Cacheable::Header { filename, .. } => {
-                    ATTACHMENTS_PATH_COHOST_HEADER.join(&format!("{filename}"))?
+                    ATTACHMENTS_PATH_COHOST_HEADER.join(filename)?
                 }
             }))
         }
         fn cache_cohost_thumb(&self, id: &str) -> eyre::Result<CachedFileResult<AttachmentsPath>> {
             Ok(CachedFileResult::CachedPath(
-                ATTACHMENTS_PATH_THUMBS.join(&format!("{id}"))?,
+                ATTACHMENTS_PATH_THUMBS.join(id)?,
             ))
         }
     }

src/command/import.rs

@@ -134,7 +134,7 @@ fn fetch_h_entry_post(document: Handle, url: &str) -> eyre::Result<Option<FetchP
     };
     info!("found h-entry post");
 
-    let mut base_href = Url::parse(&url)?;
+    let mut base_href = Url::parse(url)?;
     for node in BreadthTraverse::elements(document) {
         let NodeData::Element { name, attrs, .. } = &node.data else {
             unreachable!()
@@ -191,10 +191,8 @@ fn fetch_h_entry_post(document: Handle, url: &str) -> eyre::Result<Option<FetchP
         while let Some(weak) = node.parent.take() {
             let parent = weak.upgrade().expect("dangling weak pointer");
             node.parent.set(Some(weak));
-            if has_class(parent.clone(), "h-entry")? {
-                if !Rc::ptr_eq(&parent, &h_entry) {
-                    continue 'category;
-                }
+            if has_class(parent.clone(), "h-entry")? && !Rc::ptr_eq(&parent, &h_entry) {
+                continue 'category;
             }
             node = parent;
         }
@@ -239,10 +237,10 @@ async fn fetch_akkoma_post(
             let NodeData::Element { name, attrs, .. } = &node.data else {
                 unreachable!()
             };
-            if name == &QualName::html("script") {
-                if attrs.borrow().attr_str("id")? == Some("initial-results") {
-                    return Ok(Some(serde_json::from_str(&text_content(node)?)?));
-                }
+            if name == &QualName::html("script")
+                && attrs.borrow().attr_str("id")? == Some("initial-results")
+            {
+                return Ok(Some(serde_json::from_str(&text_content(node)?)?));
             }
         }
         Ok(None)
@@ -262,7 +260,7 @@ async fn fetch_akkoma_post(
     let status_id = fetched_page_url
         .path_segments()
         .ok_or_eyre("bad page url")?
-        .last()
+        .next_back()
         .ok_or_eyre("page url has no last path segment")?;
     trace!(?status_id);
     let api_url = instance_url.join(&format!("api/v1/statuses/{status_id}"))?;
@@ -304,7 +302,7 @@ async fn fetch_akkoma_post(
 
     Ok(Some(FetchPostResult {
         base_href: url.clone(),
-        content: content,
+        content,
         url,
         meta,
     }))
@@ -349,75 +347,66 @@ fn process_content(
     let dom = parse_html_fragment(content.as_bytes())?;
 
     for node in BreadthTraverse::nodes(dom.document.clone()) {
-        match &node.data {
-            NodeData::Element { name, attrs, .. } => {
-                let mut attrs = attrs.borrow_mut();
-                let mut extra_attrs = vec![];
-                if let Some(attr_names) = html_attributes_with_embedding_urls().get(name) {
-                    for attr in attrs.iter_mut() {
-                        if attr_names.contains(&attr.name) {
-                            // rewrite attachment urls to relative cached paths.
-                            let old_url = attr.value.to_str().to_owned();
-                            let fetch_url = base_href.join(&old_url)?;
-                            trace!(
-                                "found attachment url in <{} {}>: {old_url}",
-                                name.local,
-                                attr.name.local
-                            );
-                            attr.value = context
-                                .cache_imported(&fetch_url.to_string(), post_basename)?
-                                .site_path()?
-                                .base_relative_url()
-                                .into();
-                            extra_attrs.push(Attribute {
-                                name: QualName::attribute(&format!(
-                                    "data-import-{}",
-                                    attr.name.local
-                                )),
-                                value: old_url.into(),
-                            });
-                        }
+        if let NodeData::Element { name, attrs, .. } = &node.data {
+            let mut attrs = attrs.borrow_mut();
+            let mut extra_attrs = vec![];
+            if let Some(attr_names) = html_attributes_with_embedding_urls().get(name) {
+                for attr in attrs.iter_mut() {
+                    if attr_names.contains(&attr.name) {
+                        // rewrite attachment urls to relative cached paths.
+                        let old_url = attr.value.to_str().to_owned();
+                        let fetch_url = base_href.join(&old_url)?;
+                        trace!(
+                            "found attachment url in <{} {}>: {old_url}",
+                            name.local,
+                            attr.name.local
+                        );
+                        attr.value = context
+                            .cache_imported(fetch_url.as_ref(), post_basename)?
+                            .site_path()?
+                            .base_relative_url()
+                            .into();
+                        extra_attrs.push(Attribute {
+                            name: QualName::attribute(&format!("data-import-{}", attr.name.local)),
+                            value: old_url.into(),
+                        });
                     }
                 }
-                if let Some(attr_names) = html_attributes_with_non_embedding_urls().get(name) {
-                    for attr in attrs.iter_mut() {
-                        if attr_names.contains(&attr.name) {
-                            // rewrite urls in links to bake in the `base_href`.
-                            let old_url = attr.value.to_str().to_owned();
-                            let new_url = if old_url.starts_with("#") {
-                                format!("#user-content-{}", &old_url[1..])
-                            } else {
-                                base_href.join(&old_url)?.to_string()
-                            };
-                            trace!(
-                                "rewriting <{} {}>: {old_url:?} -> {new_url:?}",
-                                name.local,
-                                attr.name.local,
-                            );
-                            attr.value = new_url.to_string().into();
-                            extra_attrs.push(Attribute {
-                                name: QualName::attribute(&format!(
-                                    "data-import-{}",
-                                    attr.name.local
-                                )),
-                                value: old_url.into(),
-                            });
-                        }
+            }
+            if let Some(attr_names) = html_attributes_with_non_embedding_urls().get(name) {
+                for attr in attrs.iter_mut() {
+                    if attr_names.contains(&attr.name) {
+                        // rewrite urls in links to bake in the `base_href`.
+                        let old_url = attr.value.to_str().to_owned();
+                        let new_url = if let Some(fragment) = old_url.strip_prefix("#") {
+                            format!("#user-content-{fragment}")
+                        } else {
+                            base_href.join(&old_url)?.to_string()
+                        };
+                        trace!(
+                            "rewriting <{} {}>: {old_url:?} -> {new_url:?}",
+                            name.local,
+                            attr.name.local,
+                        );
+                        attr.value = new_url.to_string().into();
+                        extra_attrs.push(Attribute {
+                            name: QualName::attribute(&format!("data-import-{}", attr.name.local)),
+                            value: old_url.into(),
+                        });
                     }
                 }
-                if name == &QualName::html("img") {
-                    extra_attrs.push(Attribute {
-                        name: QualName::attribute("loading"),
-                        value: "lazy".into(),
-                    });
-                }
-                attrs.extend(extra_attrs);
             }
-            _ => {}
+            if name == &QualName::html("img") {
+                extra_attrs.push(Attribute {
+                    name: QualName::attribute("loading"),
+                    value: "lazy".into(),
+                });
+            }
+            attrs.extend(extra_attrs);
         }
     }
 
-    Ok(serialize_html_fragment(dom)?)
+    serialize_html_fragment(dom)
 }
 
 fn mf2_e(node: Handle, class: &str) -> eyre::Result<Option<String>> {
@@ -519,7 +508,7 @@ fn mf2_find_all(node: Handle, class: &str) -> Vec<Handle> {
 fn has_class(node: Handle, class: &str) -> eyre::Result<bool> {
     if let NodeData::Element { attrs, .. } = &node.data {
         if let Some(node_class) = attrs.borrow().attr_str("class")? {
-            if node_class.split(" ").find(|&c| c == class).is_some() {
+            if node_class.split(" ").any(|c| c == class) {
                 return Ok(true);
             }
         }

src/command/new.rs

@@ -18,7 +18,7 @@ pub fn main(args: New) -> eyre::Result<()> {
     info!("creating new site in {path:?}");
 
     create_dir_all(path)?;
-    for entry in read_dir(path)? {
+    if let Some(entry) = (read_dir(path)?).next() {
         bail!("directory is not empty: {:?}", entry?.path());
     }
     let mut settings = File::create_new(path.join("autost.toml"))?;

src/command/render.rs

@@ -54,7 +54,7 @@ pub fn render_all() -> eyre::Result<()> {
     render(post_paths)
 }
 
-pub fn render<'posts>(post_paths: Vec<PostsPath>) -> eyre::Result<()> {
+pub fn render(post_paths: Vec<PostsPath>) -> eyre::Result<()> {
     run_migrations()?;
 
     let now = Utc::now().to_rfc3339_opts(SecondsFormat::Millis, true);
@@ -97,7 +97,7 @@ pub fn render<'posts>(post_paths: Vec<PostsPath>) -> eyre::Result<()> {
         ),
     ];
     for file in static_files.iter() {
-        copy_static(&*SITE_PATH_ROOT, file)?;
+        copy_static(&SITE_PATH_ROOT, file)?;
     }
     #[cfg(unix)]
     {
@@ -163,7 +163,7 @@ pub fn render<'posts>(post_paths: Vec<PostsPath>) -> eyre::Result<()> {
             &format!("{} — {tag}", SETTINGS.site_title),
             &now,
         )?;
-        writeln!(File::create(&atom_feed_path)?, "{}", atom_feed,)?;
+        writeln!(File::create(&atom_feed_path)?, "{atom_feed}",)?;
         interesting_output_paths.insert(atom_feed_path);
         let threads_content = render_cached_threads_content(&threads_cache, &threads);
         let threads_page = ThreadsPageTemplate::render(
@@ -173,7 +173,7 @@ pub fn render<'posts>(post_paths: Vec<PostsPath>) -> eyre::Result<()> {
         )?;
         // TODO: move this logic into path module and check for slashes
         let threads_page_path = SITE_PATH_TAGGED.join(&format!("{tag}.html"))?;
-        writeln!(File::create(&threads_page_path)?, "{}", threads_page)?;
+        writeln!(File::create(&threads_page_path)?, "{threads_page}")?;
         interesting_output_paths.insert(threads_page_path);
     }
 
@@ -294,7 +294,7 @@ fn render_single_post(path: PostsPath) -> eyre::Result<CacheableRenderResult> {
         &SETTINGS.page_title(thread.meta.title.as_deref()),
         &None,
     )?;
-    writeln!(File::create(rendered_path)?, "{}", threads_page)?;
+    writeln!(File::create(rendered_path)?, "{threads_page}")?;
 
     let result = CacheableRenderResult {
         render_result: result,
@@ -406,7 +406,7 @@ impl Collections {
     }
 
     fn keys(&self) -> impl Iterator<Item = &str> {
-        self.inner.keys().map(|key| *key)
+        self.inner.keys().copied()
     }
 
     fn len(&self, key: &str) -> usize {

src/css.rs

@@ -29,7 +29,7 @@ pub fn serialise_inline_style(tokens: &[InlineStyleToken]) -> String {
         .join("")
 }
 
-fn parse<'i>(parser: &'i mut Parser) -> Vec<InlineStyleToken> {
+fn parse(parser: &mut Parser) -> Vec<InlineStyleToken> {
     let mut result = vec![];
     loop {
         let token = match parser.next_including_whitespace_and_comments() {

src/dom.rs

@@ -269,13 +269,8 @@ pub trait AttrsMutExt: AttrsRefExt {
 }
 impl AttrsMutExt for Vec<Attribute> {
     fn attr_mut(&mut self, name: &str) -> Option<&mut Attribute> {
-        for attr in self.iter_mut() {
-            if attr.name == QualName::attribute(name) {
-                return Some(attr);
-            }
-        }
-
-        None
+        self.iter_mut()
+            .find(|attr| attr.name == QualName::attribute(name))
     }
 }
 impl AttrsRefExt for Vec<Attribute> {