chore: Bump MSRV to 1.88.0, use let chains

Author: scrabsha

Cargo.toml

@@ -5,7 +5,7 @@ resolver = "3"
 repository = "https://github.com/rust-lang/annotate-snippets-rs"
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.85.0"  # MSRV
+rust-version = "1.88.0"  # MSRV
 include = [
   "build.rs",
   "src/**/*",

src/renderer/render.rs

@@ -1098,8 +1098,7 @@ fn render_source_line(
     if annotations_position
         .iter()
         .all(|(_, ann)| matches!(ann.annotation_type, LineAnnotationType::MultilineStart(_)))
-    {
-        if let Some(max_pos) = annotations_position.iter().map(|(pos, _)| *pos).max() {
+        && let Some(max_pos) = annotations_position.iter().map(|(pos, _)| *pos).max() {
             // Special case the following, so that we minimize overlapping multiline spans.
             //
             // 3 │       X0 Y0 Z0
@@ -1119,7 +1118,6 @@ fn render_source_line(
             // one line of vertical space.
             line_len = line_len.saturating_sub(1);
         }
-    }
 
     // Write the column separator.
     //
@@ -1447,41 +1445,38 @@ fn emit_suggestion_default(
     let (complete, parts, highlights) = spliced_lines;
     let is_multiline = complete.lines().count() > 1;
 
-    match suggestion.path.as_ref() {
-        Some(path) if suggestion.path.as_ref() != primary_path && !matches_previous_suggestion => {
-            let (loc, _) = sm.span_to_locations(parts[0].span.clone());
-            let origin = Origin::path(path.as_ref())
-                .line(loc.line)
-                .char_column(loc.char + 1);
-
-            render_origin(
-                renderer,
-                buffer,
-                max_line_num_len,
-                &origin,
-                true,
-                is_first,
-                !is_cont,
-                row_num - 1,
-            );
-            row_num += 1;
-
-            draw_col_separator_no_space(renderer, buffer, row_num - 1, max_line_num_len + 1);
-        }
+    if suggestion.path.as_ref() != primary_path
+        && let Some(path) = suggestion.path.as_ref()
+        && !matches_previous_suggestion
+    {
+        let (loc, _) = sm.span_to_locations(parts[0].span.clone());
+        let origin = Origin::path(path.as_ref())
+            .line(loc.line)
+            .char_column(loc.char + 1);
 
-        _ if matches_previous_suggestion => {
-            buffer.puts(
-                row_num - 1,
-                max_line_num_len + 1,
-                renderer.decor_style.multi_suggestion_separator(),
-                ElementStyle::LineNumber,
-            );
-        }
+        render_origin(
+            renderer,
+            buffer,
+            max_line_num_len,
+            &origin,
+            true,
+            is_first,
+            !is_cont,
+            row_num - 1,
+        );
 
-        _ => {
-            draw_col_separator_start(renderer, buffer, row_num - 1, max_line_num_len + 1);
-        }
-    }
+        draw_col_separator_no_space(renderer, buffer, row_num, max_line_num_len + 1);
+        row_num += 1;
+    } else if matches_previous_suggestion {
+         buffer.puts(
+             row_num - 1,
+             max_line_num_len + 1,
+             renderer.decor_style.multi_suggestion_separator(),
+             ElementStyle::LineNumber,
+         );
+     } else {
+         draw_col_separator_start(renderer, buffer, row_num - 1, max_line_num_len + 1);
+     }
 
     if let DisplaySuggestion::Diff = show_code_change {
         row_num += 1;

src/renderer/styled_buffer.rs

@@ -159,12 +159,11 @@ impl StyledBuffer {
         style: ElementStyle,
         overwrite: bool,
     ) {
-        if let Some(ref mut line) = self.lines.get_mut(line) {
-            if let Some(StyledChar { style: s, .. }) = line.get_mut(col) {
-                if overwrite || matches!(s, ElementStyle::NoStyle | ElementStyle::Quotation) {
-                    *s = style;
-                }
-            }
+        if let Some(ref mut line) = self.lines.get_mut(line)
+            && let Some(StyledChar { style: s, .. }) = line.get_mut(col)
+            && (overwrite || matches!(s, ElementStyle::NoStyle | ElementStyle::Quotation))
+        {
+            *s = style;
         }
     }
 }