fix: resolve Clippy issues (#113)

Author: DanielleHuisman

packages/mdbook-plugin-utils/src/markdown/block.rs

@@ -33,7 +33,7 @@ pub fn parse_blocks<IsStartFn, IsEndFn>(
     is_start: IsStartFn,
     is_end: IsEndFn,
     skip_nested: bool,
-) -> Result<Vec<Block>>
+) -> Result<Vec<Block<'_>>>
 where
     IsStartFn: Fn(&Event) -> bool,
     IsEndFn: Fn(&Event) -> bool,
@@ -45,57 +45,58 @@ where
         debug!("{event:?} {span:?}");
 
         if is_start(&event) {
-            if let Some(block) = blocks.last_mut() {
-                if !block.closed {
-                    if skip_nested {
-                        nested_level += 1;
-                        block.has_nested = true;
-                        block.events.push((event, span));
-                        continue;
-                    } else {
-                        bail!("Block is not closed. Nested blocks are not allowed.");
-                    }
+            if let Some(block) = blocks.last_mut()
+                && !block.closed
+            {
+                if skip_nested {
+                    nested_level += 1;
+                    block.has_nested = true;
+                    block.events.push((event, span));
+                    continue;
+                } else {
+                    bail!("Block is not closed. Nested blocks are not allowed.");
                 }
             }
 
             blocks.push(Block::new(event, span));
         } else if is_end(&event) {
-            if let Some(block) = blocks.last_mut() {
-                if !block.closed {
-                    if nested_level > 0 {
-                        nested_level -= 1;
-                        block.events.push((event, span));
-                        continue;
-                    }
-
-                    block.closed = true;
-                    block.span = block.span.start..span.end;
+            if let Some(block) = blocks.last_mut()
+                && !block.closed
+            {
+                if nested_level > 0 {
+                    nested_level -= 1;
                     block.events.push((event, span));
+                    continue;
+                }
 
-                    let mut seen_first = false;
-                    block.events.retain(|(_, span)| {
-                        if !seen_first {
-                            seen_first = true;
-                            true
-                        } else if span.start == block.span.start && span.end != block.span.end {
-                            false
-                        } else {
-                            span.start >= block.span.start && span.end <= block.span.end
-                        }
-                    });
-
-                    if let (Some((_, first)), Some((_, last))) = (
-                        block.events.get(1),
-                        block.events.get(block.events.len() - 2),
-                    ) {
-                        block.inner_span = first.start..last.end;
+                block.closed = true;
+                block.span = block.span.start..span.end;
+                block.events.push((event, span));
+
+                let mut seen_first = false;
+                block.events.retain(|(_, span)| {
+                    if !seen_first {
+                        seen_first = true;
+                        true
+                    } else if span.start == block.span.start && span.end != block.span.end {
+                        false
+                    } else {
+                        span.start >= block.span.start && span.end <= block.span.end
                     }
+                });
+
+                if let (Some((_, first)), Some((_, last))) = (
+                    block.events.get(1),
+                    block.events.get(block.events.len() - 2),
+                ) {
+                    block.inner_span = first.start..last.end;
                 }
             }
-        } else if let Some(block) = blocks.last_mut() {
-            if !block.closed && span.start >= block.span.start {
-                block.events.push((event, span));
-            }
+        } else if let Some(block) = blocks.last_mut()
+            && !block.closed
+            && span.start >= block.span.start
+        {
+            block.events.push((event, span));
         }
     }
 

packages/mdbook-plugin-utils/src/markdown/code_block.rs

@@ -24,7 +24,7 @@ fn is_code_block_end(event: &Event) -> bool {
     matches!(event, Event::End(TagEnd::CodeBlock))
 }
 
-pub fn parse_code_blocks<IsTagsFn>(content: &str, is_tags: IsTagsFn) -> Result<Vec<Block>>
+pub fn parse_code_blocks<IsTagsFn>(content: &str, is_tags: IsTagsFn) -> Result<Vec<Block<'_>>>
 where
     IsTagsFn: Fn(Vec<String>) -> bool + 'static,
 {

packages/mdbook-trunk/src/trunk.rs

@@ -85,7 +85,11 @@ fn files(workspace: &Workspace, config: &Config) -> Result<String> {
 
             header_elements.push(format!(
                 "<button class=\"mdbook-trunk-file{}\" data-file=\"{}\">{}</button>",
-                if config.show_files.unwrap_or(false) && index == 0 { " active" } else { Default::default() },
+                if config.show_files.unwrap_or(false) && index == 0 {
+                    " active"
+                } else {
+                    Default::default()
+                },
                 file,
                 file_path
                     .file_name()