Merge pull request #1020 from epage/snapbox

chore: Upgrade to snapbox 0.6
crate-ci · May 28, 2024 · f98d8d9 · f98d8d9
2 parents 27ba976 + 49b5ca5
commit f98d8d9
Show file tree

Hide file tree

Showing 16 changed files with 59 additions and 46 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/codespell-dict/Cargo.toml b/crates/codespell-dict/Cargo.toml
@@ -25,7 +25,7 @@ unicase = "2.7"
 itertools = "0.12"
 codegenrs = "3.0"
 dictgen = { version = "^0.2", path = "../dictgen", features = ["codegen"] }
-snapbox = { version = "0.5.9", features = ["path"] }
+snapbox = "0.6.5"
 typos = { path = "../typos" }
 
 [lints]

diff --git a/crates/codespell-dict/tests/codegen.rs b/crates/codespell-dict/tests/codegen.rs
@@ -7,7 +7,7 @@ fn codegen() {
 
     let content = String::from_utf8(content).unwrap();
     let content = codegenrs::rustfmt(&content, None).unwrap();
-    snapbox::assert_eq(snapbox::file!["../src/dict_codegen.rs"], content);
+    snapbox::assert_data_eq!(content, snapbox::file!["../src/dict_codegen.rs"].raw());
 }
 
 #[test]
@@ -31,7 +31,7 @@ fn compat() {
         writeln!(content).unwrap();
     }
 
-    snapbox::assert_eq(snapbox::file!["../assets/compatible.csv"], &content);
+    snapbox::assert_data_eq!(content, snapbox::file!["../assets/compatible.csv"].raw());
 }
 
 fn is_word(word: &str) -> bool {

diff --git a/crates/misspell-dict/Cargo.toml b/crates/misspell-dict/Cargo.toml
@@ -24,7 +24,7 @@ itertools = "0.12"
 codegenrs = "3.0"
 regex = "1"
 dictgen = { version = "^0.2", path = "../dictgen", features = ["codegen"] }
-snapbox = { version = "0.5.9", features = ["path"] }
+snapbox = "0.6.5"
 
 [lints]
 workspace = true
diff --git a/crates/misspell-dict/tests/codegen.rs b/crates/misspell-dict/tests/codegen.rs
@@ -9,7 +9,7 @@ fn codegen() {
 
     let content = String::from_utf8(content).unwrap();
     let content = codegenrs::rustfmt(&content, None).unwrap();
-    snapbox::assert_eq(snapbox::file!["../src/dict_codegen.rs"], content);
+    snapbox::assert_data_eq!(content, snapbox::file!["../src/dict_codegen.rs"].raw());
 }
 
 fn generate<W: std::io::Write>(file: &mut W) {

diff --git a/crates/typos-cli/Cargo.toml b/crates/typos-cli/Cargo.toml
@@ -81,8 +81,8 @@ encoding_rs = "0.8.34"
 [dev-dependencies]
 assert_fs = "1.1"
 divan = "0.1.14"
-snapbox = "0.5.9"
-trycmd = "0.15.1"
+snapbox = "0.6.5"
+trycmd = "0.15.4"
 
 [[bench]]
 name = "check_file"

diff --git a/crates/typos-cli/src/file_type_specifics.rs b/crates/typos-cli/src/file_type_specifics.rs
@@ -88,6 +88,7 @@ pub(crate) struct StaticDictConfig {
 #[cfg(test)]
 mod tests {
     use itertools::Itertools;
+    use snapbox::prelude::*;
 
     use super::TYPE_SPECIFIC_DICTS;
 
@@ -96,7 +97,7 @@ mod tests {
         let types: Vec<_> = TYPE_SPECIFIC_DICTS.iter().map(|(typ, _)| *typ).collect();
         let types_unique: Vec<_> = types.clone().into_iter().unique().collect();
 
-        snapbox::assert_eq(types.join("\n"), types_unique.join("\n"));
+        snapbox::assert_data_eq!(types_unique.join("\n"), types.join("\n").raw());
     }
 
     #[test]
@@ -108,6 +109,6 @@ mod tests {
         let types: Vec<_> = TYPE_SPECIFIC_DICTS.iter().map(|(typ, _)| *typ).collect();
         let types_sorted: Vec<_> = types.iter().cloned().sorted().collect();
 
-        snapbox::assert_eq(types.join("\n"), types_sorted.join("\n"));
+        snapbox::assert_data_eq!(types_sorted.join("\n"), types.join("\n").raw());
     }
 }
diff --git a/crates/typos-dict/Cargo.toml b/crates/typos-dict/Cargo.toml
@@ -27,7 +27,7 @@ unicase = "2.7"
 codegenrs = "3.0"
 dictgen = { version = "^0.2", path = "../dictgen", features = ["codegen"] }
 varcon = { version = "^0.7", path = "../varcon" }
-snapbox = { version = "0.5.9", features = ["path"] }
+snapbox = "0.6.5"
 indexmap = "2.2.6"
 
 [lints]

diff --git a/crates/typos-dict/tests/codegen.rs b/crates/typos-dict/tests/codegen.rs
@@ -6,7 +6,7 @@ fn codegen() {
 
     let content = String::from_utf8(content).unwrap();
     let content = codegenrs::rustfmt(&content, None).unwrap();
-    snapbox::assert_eq(snapbox::file!["../src/word_codegen.rs"], content);
+    snapbox::assert_data_eq!(content, snapbox::file!["../src/word_codegen.rs"].raw());
 }
 
 fn generate<W: std::io::Write>(file: &mut W, prefix: &str, dict: &[u8]) {

diff --git a/crates/typos-dict/tests/verify.rs b/crates/typos-dict/tests/verify.rs
@@ -25,7 +25,7 @@ fn verify() {
     drop(wtr);
 
     let content = String::from_utf8(content).unwrap();
-    snapbox::assert_eq(snapbox::file!["../assets/words.csv"], content);
+    snapbox::assert_data_eq!(content, snapbox::file!["../assets/words.csv"].raw());
 }
 
 fn parse_dict(path: &str) -> Vec<(String, Vec<String>)> {

diff --git a/crates/typos-vars/Cargo.toml b/crates/typos-vars/Cargo.toml
@@ -28,7 +28,7 @@ unicase = "2.7"
 codegenrs = "3.0"
 itertools = "0.12"
 dictgen = { version = "^0.2", path = "../dictgen", features = ["codegen"] }
-snapbox = { version = "0.5.9", features = ["path"] }
+snapbox = "0.6.5"
 
 [lints]
 workspace = true
diff --git a/crates/typos-vars/tests/codegen.rs b/crates/typos-vars/tests/codegen.rs
@@ -9,7 +9,7 @@ fn codegen() {
 
     let content = String::from_utf8(content).unwrap();
     let content = codegenrs::rustfmt(&content, None).unwrap();
-    snapbox::assert_eq(snapbox::file!["../src/vars_codegen.rs"], content);
+    snapbox::assert_data_eq!(content, snapbox::file!["../src/vars_codegen.rs"].raw());
 }
 
 static CATEGORIES: [varcon::Category; 4] = [

diff --git a/crates/varcon/Cargo.toml b/crates/varcon/Cargo.toml
@@ -26,7 +26,7 @@ varcon-core = { version = "^4.0", path = "../varcon-core" }
 [dev-dependencies]
 codegenrs = "3.0"
 varcon-core = { version = "^4.0", path = "../varcon-core", features = ["parser"] }
-snapbox = { version = "0.5.9", features = ["path"] }
+snapbox = "0.6.5"
 
 [lints]
 workspace = true
diff --git a/crates/varcon/tests/codegen.rs b/crates/varcon/tests/codegen.rs
@@ -9,7 +9,7 @@ fn codegen() {
 
     let content = String::from_utf8(content).unwrap();
     let content = codegenrs::rustfmt(&content, None).unwrap();
-    snapbox::assert_eq(snapbox::file!["../src/codegen.rs"], content);
+    snapbox::assert_data_eq!(content, snapbox::file!["../src/codegen.rs"].raw());
 }
 
 fn generate<W: std::io::Write>(file: &mut W) {

diff --git a/crates/wikipedia-dict/Cargo.toml b/crates/wikipedia-dict/Cargo.toml
@@ -24,7 +24,7 @@ unicase = "2.7"
 itertools = "0.12"
 codegenrs = "3.0"
 dictgen = { version = "^0.2", path = "../dictgen", features = ["codegen"] }
-snapbox = { version = "0.5.9", features = ["path"] }
+snapbox = "0.6.5"
 
 [lints]
 workspace = true
diff --git a/crates/wikipedia-dict/tests/codegen.rs b/crates/wikipedia-dict/tests/codegen.rs
@@ -7,7 +7,7 @@ fn codegen() {
 
     let content = String::from_utf8(content).unwrap();
     let content = codegenrs::rustfmt(&content, None).unwrap();
-    snapbox::assert_eq(snapbox::file!["../src/dict_codegen.rs"], content);
+    snapbox::assert_data_eq!(content, snapbox::file!["../src/dict_codegen.rs"].raw());
 }
 
 fn generate<W: std::io::Write>(file: &mut W) {