Merge pull request #239 from Muscraft/fold-default

epage · web-flow · commit 8a794fa7bd7c · 2025-07-01T20:40:52.000-05:00
chore!: Make fold the default
diff --git a/benches/bench.rs b/benches/bench.rs
@@ -71,14 +71,11 @@ fn fold(bencher: divan::Bencher<'_, '_>, context: usize) {
         .bench_values(|(input, span)| {
             let message = &[
                 Group::with_title(Level::ERROR.title("mismatched types").id("E0308")).element(
-                    Snippet::source(&input)
-                        .fold(true)
-                        .path("src/format.rs")
-                        .annotation(
-                            AnnotationKind::Context
-                                .span(span)
-                                .label("expected `Option<String>` because of return type"),
-                        ),
+                    Snippet::source(&input).path("src/format.rs").annotation(
+                        AnnotationKind::Context
+                            .span(span)
+                            .label("expected `Option<String>` because of return type"),
+                    ),
                 ),
             ];
 
diff --git a/examples/custom_error.rs b/examples/custom_error.rs
@@ -22,14 +22,11 @@ pub static C: u32 = 0 - 1;
             .id("E0080"),
     )
     .element(
-        Snippet::source(source)
-            .path("$DIR/err.rs")
-            .fold(true)
-            .annotation(
-                AnnotationKind::Primary
-                    .span(386..391)
-                    .label("attempt to compute `0_u32 - 1_u32`, which would overflow"),
-            ),
+        Snippet::source(source).path("$DIR/err.rs").annotation(
+            AnnotationKind::Primary
+                .span(386..391)
+                .label("attempt to compute `0_u32 - 1_u32`, which would overflow"),
+        ),
     )];
 
     let renderer = Renderer::styled().theme(OutputTheme::Unicode);
diff --git a/examples/custom_level.rs b/examples/custom_level.rs
@@ -39,7 +39,6 @@ fn main() {
             Snippet::source(source)
                 .line_start(1)
                 .path("$DIR/issue-114529-illegal-break-with-value.rs")
-                .fold(true)
                 .annotation(
                     AnnotationKind::Primary
                         .span(483..581)
@@ -60,7 +59,6 @@ fn main() {
             Snippet::source(source)
                 .line_start(1)
                 .path("$DIR/issue-114529-illegal-break-with-value.rs")
-                .fold(true)
                 .patch(Patch::new(483..581, "break")),
         ),
     ];
diff --git a/examples/expected_type.rs b/examples/expected_type.rs
@@ -11,7 +11,6 @@ fn main() {
                 Snippet::source(source)
                     .line_start(26)
                     .path("examples/footer.rs")
-                    .fold(true)
                     .annotation(AnnotationKind::Primary.span(193..195).label(
                         "expected struct `annotate_snippets::snippet::Slice`, found reference",
                     ))
diff --git a/examples/format.rs b/examples/format.rs
@@ -28,6 +28,7 @@ fn main() {
             Snippet::source(source)
                 .line_start(51)
                 .path("src/format.rs")
+                .fold(false)
                 .annotation(
                     AnnotationKind::Context
                         .span(5..19)
diff --git a/examples/highlight_source.rs b/examples/highlight_source.rs
@@ -13,7 +13,6 @@ fn main() {}
         .id("E0010"))
         .element(
             Snippet::source(source)
-                .fold(true)
                 .path("$DIR/E0010-teach.rs")
                 .annotation(
                     AnnotationKind::Primary
diff --git a/examples/highlight_title.rs b/examples/highlight_title.rs
@@ -45,7 +45,6 @@ fn main() {
         Group::with_title(Level::ERROR.title("mismatched types").id("E0308"))
             .element(
                 Snippet::source(source)
-                    .fold(true)
                     .path("$DIR/highlighting.rs")
                     .annotation(
                         AnnotationKind::Primary
@@ -61,7 +60,6 @@ fn main() {
             .element(Level::NOTE.pre_styled_title(&title)),
         Group::with_title(Level::NOTE.title("function defined here")).element(
             Snippet::source(source)
-                .fold(true)
                 .path("$DIR/highlighting.rs")
                 .annotation(AnnotationKind::Context.span(200..333).label(""))
                 .annotation(AnnotationKind::Primary.span(194..199)),
diff --git a/examples/id_hyperlink.rs b/examples/id_hyperlink.rs
@@ -17,7 +17,6 @@ fn main() {
         Snippet::source(source)
             .line_start(1)
             .path("$DIR/terminal_urls.rs")
-            .fold(true)
             .annotation(
                 AnnotationKind::Primary
                     .span(59..61)
diff --git a/examples/multislice.rs b/examples/multislice.rs
@@ -5,11 +5,13 @@ fn main() {
         .element(
             Snippet::<Annotation<'_>>::source("Foo")
                 .line_start(51)
+                .fold(false)
                 .path("src/format.rs"),
         )
         .element(
             Snippet::<Annotation<'_>>::source("Faa")
                 .line_start(129)
+                .fold(false)
                 .path("src/display.rs"),
         )];
 
diff --git a/src/renderer/mod.rs b/src/renderer/mod.rs
@@ -29,7 +29,6 @@
 //!      Snippet::source(source)
 //!          .path("temp.rs")
 //!          .line_start(1)
-//!          .fold(true)
 //!          .annotation(
 //!              AnnotationKind::Primary
 //!                  .span(10..13)
diff --git a/src/snippet.rs b/src/snippet.rs
@@ -168,7 +168,7 @@ impl<'a, T: Clone> Snippet<'a, T> {
             line_start: 1,
             source: source.into(),
             markers: vec![],
-            fold: false,
+            fold: true,
         }
     }
 
diff --git a/tests/color/fold_ann_multiline.rs b/tests/color/fold_ann_multiline.rs
@@ -33,7 +33,6 @@ fn case() {
             Snippet::source(source)
                 .path("src/format.rs")
                 .line_start(51)
-                .fold(true)
                 .annotation(AnnotationKind::Context.span(5..19).label(
                     "expected `std::option::Option<std::string::String>` because of return type",
                 ))
diff --git a/tests/color/fold_bad_origin_line.rs b/tests/color/fold_bad_origin_line.rs
@@ -13,7 +13,6 @@ invalid syntax
         Snippet::source(source)
             .path("path/to/error.rs")
             .line_start(1)
-            .fold(true)
             .annotation(AnnotationKind::Context.span(2..16).label("error here")),
     )];
     let expected = file!["fold_bad_origin_line.term.svg"];
diff --git a/tests/color/fold_leading.rs b/tests/color/fold_leading.rs
@@ -26,7 +26,6 @@ workspace = 20
         Snippet::source(source)
             .path("Cargo.toml")
             .line_start(1)
-            .fold(true)
             .annotation(AnnotationKind::Primary.span(132..134).label("")),
     )];
     let expected = file!["fold_leading.term.svg"];
diff --git a/tests/color/fold_trailing.rs b/tests/color/fold_trailing.rs
@@ -25,7 +25,6 @@ edition = "2021"
         Snippet::source(source)
             .path("Cargo.toml")
             .line_start(1)
-            .fold(true)
             .annotation(AnnotationKind::Primary.span(8..10).label("")),
     )];
     let expected = file!["fold_trailing.term.svg"];
diff --git a/tests/color/multiline_removal_suggestion.rs b/tests/color/multiline_removal_suggestion.rs
@@ -73,7 +73,6 @@ fn main() {}
             .element(
                 Snippet::source(source)
                     .path("$DIR/multiline-removal-suggestion.rs")
-                    .fold(true)
                     .annotation(
                         AnnotationKind::Primary
                             .span(769..776)
@@ -96,7 +95,7 @@ fn main() {}
         Group::with_title(Level::HELP.title("consider removing this method call, as the receiver has type `std::vec::IntoIter<HashSet<u8>>` and `std::vec::IntoIter<HashSet<u8>>: Iterator` trivially holds")).element(
             Snippet::source(source)
                 .path("$DIR/multiline-removal-suggestion.rs")
-                .fold(true)
+
                 .patch(Patch::new(708..768, "")),
         ),
     ];
diff --git a/tests/color/multiple_annotations.rs b/tests/color/multiple_annotations.rs
@@ -18,6 +18,7 @@ fn case() {
     let input = &[Group::with_title(Level::ERROR.title("")).element(
         Snippet::source(source)
             .line_start(96)
+            .fold(false)
             .annotation(
                 AnnotationKind::Primary
                     .span(100..110)
diff --git a/tests/formatter.rs b/tests/formatter.rs
diff --git a/tests/rustc_tests.rs b/tests/rustc_tests.rs
