chore: Upgrade to snapbox 0.6

Cargo.toml

@@ -33,8 +33,9 @@ criterion = "0.5.1"
 difference = "2.0.0"
 glob = "0.3.1"
 serde = { version = "1.0.199", features = ["derive"] }
-snapbox = { version = "0.5.9", features = ["diff", "harness", "path", "term-svg", "cmd", "examples"] }
+snapbox = { version = "0.6.0", features = ["diff", "term-svg", "cmd", "examples"] }
 toml = "0.5.11"
+tryfn = "0.2.1"
 
 [[bench]]
 name = "simple"

tests/examples.rs

@@ -33,5 +33,5 @@ fn assert_example(target: &str, expected: snapbox::Data) {
         .env("CLICOLOR_FORCE", "1")
         .assert()
         .success()
-        .stdout_eq(expected);
+        .stdout_eq(expected.raw());
 }

tests/fixtures/main.rs

@@ -8,16 +8,15 @@ use std::error::Error;
 
 fn main() {
     #[cfg(not(windows))]
-    snapbox::harness::Harness::new("tests/fixtures/", setup, test)
+    tryfn::Harness::new("tests/fixtures/", setup, test)
         .select(["*/*.toml"])
-        .action_env("SNAPSHOTS")
         .test();
 }
 
-fn setup(input_path: std::path::PathBuf) -> snapbox::harness::Case {
+fn setup(input_path: std::path::PathBuf) -> tryfn::Case {
     let name = input_path.file_name().unwrap().to_str().unwrap().to_owned();
-    let expected = input_path.with_extension("svg");
-    snapbox::harness::Case {
+    let expected = tryfn::Data::read_from(&input_path.with_extension("svg"), None);
+    tryfn::Case {
         name,
         fixture: input_path,
         expected,

tests/formatter.rs

@@ -1,6 +1,6 @@
 use annotate_snippets::{Level, Renderer, Snippet};
 
-use snapbox::{assert_eq, str};
+use snapbox::{assert_data_eq, str};
 
 #[test]
 fn test_i_29() {
@@ -16,11 +16,11 @@ error: oops
   |
 2 | Second oops line
   |        ^^^^ oops
-  |"#]]
-    .indent(false);
+  |
+"#]];
 
     let renderer = Renderer::plain();
-    assert_eq(expected, renderer.render(snippets).to_string());
+    assert_data_eq!(renderer.render(snippets).to_string(), expected);
 }
 
 #[test]
@@ -37,11 +37,11 @@ error
   |
 1 | こんにちは、世界
   |             ^^^^ world
-  |"#]]
-    .indent(false);
+  |
+"#]];
 
     let renderer = Renderer::plain();
-    assert_eq(expected, renderer.render(snippets).to_string());
+    assert_data_eq!(renderer.render(snippets).to_string(), expected);
 }
 
 #[test]
@@ -60,11 +60,11 @@ error
   |  _____^
 2 | | ございます
   | |______^ Good morning
-  |"#]]
-    .indent(false);
+  |
+"#]];
 
     let renderer = Renderer::plain();
-    assert_eq(expected, renderer.render(snippets).to_string());
+    assert_data_eq!(renderer.render(snippets).to_string(), expected);
 }
 
 #[test]
@@ -84,11 +84,11 @@ error
   | ^^^^^^ Sushi1
 2 | 食べたい🍣
   |     ---- note: Sushi2
-  |"#]]
-    .indent(false);
+  |
+"#]];
 
     let renderer = Renderer::plain();
-    assert_eq(expected, renderer.render(snippets).to_string());
+    assert_data_eq!(renderer.render(snippets).to_string(), expected);
 }
 
 #[test]
@@ -105,11 +105,11 @@ error
   |
 1 | こんにちは、新しいWorld！
   |             ^^^^^^^^^^^ New world
-  |"#]]
-    .indent(false);
+  |
+"#]];
 
     let renderer = Renderer::plain();
-    assert_eq(expected, renderer.render(snippets).to_string());
+    assert_data_eq!(renderer.render(snippets).to_string(), expected);
 }
 
 #[test]
@@ -118,7 +118,7 @@ fn test_format_title() {
 
     let expected = str![r#"error[E0001]: This is a title"#];
     let renderer = Renderer::plain();
-    assert_eq(expected, renderer.render(input).to_string());
+    assert_data_eq!(renderer.render(input).to_string(), expected);
 }
 
 #[test]
@@ -133,10 +133,10 @@ error
      |
 5402 | This is line 1
 5403 | This is line 2
-     |"#]]
-    .indent(false);
+     |
+"#]];
     let renderer = Renderer::plain();
-    assert_eq(expected, renderer.render(input).to_string());
+    assert_data_eq!(renderer.render(input).to_string(), expected);
 }
 
 #[test]
@@ -156,10 +156,10 @@ error
     ::: file2.rs
      |
    2 | This is slice 2
-     |"#]]
-    .indent(false);
+     |
+"#]];
     let renderer = Renderer::plain();
-    assert_eq(expected, renderer.render(input).to_string());
+    assert_data_eq!(renderer.render(input).to_string(), expected);
 }
 
 #[test]
@@ -180,10 +180,10 @@ error
 5402 | This is line 1
 5403 | This is line 2
      |        -- info: Test annotation
-     |"#]]
-    .indent(false);
+     |
+"#]];
     let renderer = Renderer::plain();
-    assert_eq(expected, renderer.render(input).to_string());
+    assert_data_eq!(renderer.render(input).to_string(), expected);
 }
 
 #[test]
@@ -193,10 +193,10 @@ fn test_format_footer_title() {
         .footer(Level::Error.title("This __is__ a title"));
     let expected = str![[r#"
 error
- = error: This __is__ a title"#]]
-    .indent(false);
+ = error: This __is__ a title
+"#]];
     let renderer = Renderer::plain();
-    assert_eq(expected, renderer.render(input).to_string());
+    assert_data_eq!(renderer.render(input).to_string(), expected);
 }
 
 #[test]
@@ -224,10 +224,10 @@ error
    |
 56 | This is an example
 57 | of content lines
-   |"#]]
-    .indent(false);
+   |
+"#]];
     let renderer = Renderer::plain();
-    assert_eq(expected, renderer.render(input).to_string());
+    assert_data_eq!(renderer.render(input).to_string(), expected);
 }
 
 #[test]
@@ -243,10 +243,10 @@ error
   |
 1 | tests
   | ----- help: Example string
-  |"#]]
-    .indent(false);
+  |
+"#]];
     let renderer = Renderer::plain();
-    assert_eq(expected, renderer.render(input).to_string());
+    assert_data_eq!(renderer.render(input).to_string(), expected);
 }
 
 #[test]
@@ -264,10 +264,10 @@ error
 1 | tests
   | ----- help: Example string
   | ----- help: Second line
-  |"#]]
-    .indent(false);
+  |
+"#]];
     let renderer = Renderer::plain();
-    assert_eq(expected, renderer.render(input).to_string());
+    assert_data_eq!(renderer.render(input).to_string(), expected);
 }
 
 #[test]
@@ -279,10 +279,10 @@ fn test_only_source() {
 error
 --> file.rs
  |
- |"#]]
-    .indent(false);
+ |
+"#]];
     let renderer = Renderer::plain();
-    assert_eq(expected, renderer.render(input).to_string());
+    assert_data_eq!(renderer.render(input).to_string(), expected);
 }
 
 #[test]
@@ -298,8 +298,8 @@ LL | This is an example
 LL | of content lines
 LL | 
 LL | abc
-   |"#]]
-    .indent(false);
+   |
+"#]];
     let renderer = Renderer::plain().anonymized_line_numbers(true);
-    assert_eq(expected, renderer.render(input).to_string());
+    assert_data_eq!(renderer.render(input).to_string(), expected);
 }