From b368a52d7b8189b41faa186446c860c4c405cd5e Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 2 Jun 2025 10:24:19 -0500 Subject: [PATCH 1/4] chore: Update snapbox --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 78fb47d..ae8b55f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -249,9 +249,9 @@ checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" [[package]] name = "snapbox" -version = "0.5.0" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8269b717f21b142c0377f1e617e80999e3ef6b1c010959b44fd93320722d2cba" +checksum = "f37d101fcafc8e73748fd8a1b7048f5979f93d372fd17027d7724c1643bc379b" dependencies = [ "anstream", "anstyle", @@ -262,9 +262,9 @@ dependencies = [ [[package]] name = "snapbox-macros" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1c4b838b05d15ab22754068cb73500b2f3b07bf09d310e15b27f88160f1de40" +checksum = "16569f53ca23a41bb6f62e0a5084aa1661f4814a67fa33696a79073e03a664af" dependencies = [ "anstream", ] From e65653783aa05e6384a15c6bc13de8635be5d8c9 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 2 Jun 2025 10:26:05 -0500 Subject: [PATCH 2/4] refactor: Resolve deprecations --- crates/libtest2-mimic/tests/testsuite/all_passing.rs | 4 ++-- crates/libtest2-mimic/tests/testsuite/main_thread.rs | 2 +- crates/libtest2-mimic/tests/testsuite/mixed_bag.rs | 4 ++-- crates/libtest2-mimic/tests/testsuite/panic.rs | 4 ++-- crates/libtest2/tests/testsuite/all_passing.rs | 4 ++-- crates/libtest2/tests/testsuite/mixed_bag.rs | 4 ++-- crates/libtest2/tests/testsuite/panic.rs | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/crates/libtest2-mimic/tests/testsuite/all_passing.rs b/crates/libtest2-mimic/tests/testsuite/all_passing.rs index 3d363f5..cd40c12 100644 --- a/crates/libtest2-mimic/tests/testsuite/all_passing.rs +++ b/crates/libtest2-mimic/tests/testsuite/all_passing.rs @@ -29,12 +29,12 @@ fn check(args: &[&str], single: &str, parallel: &str) { .args(["--test-threads", "1"]) .assert() .success() - .stdout_matches(single); + .stdout_eq_(single); test_cmd() .args(args) .assert() .success() - .stdout_matches(parallel); + .stdout_eq_(parallel); } #[test] diff --git a/crates/libtest2-mimic/tests/testsuite/main_thread.rs b/crates/libtest2-mimic/tests/testsuite/main_thread.rs index 35712f2..dcec069 100644 --- a/crates/libtest2-mimic/tests/testsuite/main_thread.rs +++ b/crates/libtest2-mimic/tests/testsuite/main_thread.rs @@ -22,7 +22,7 @@ fn main() { .current_dir(package_root) .assert() .success() - .stdout_matches( + .stdout_eq_( " running 1 test ...", diff --git a/crates/libtest2-mimic/tests/testsuite/mixed_bag.rs b/crates/libtest2-mimic/tests/testsuite/mixed_bag.rs index 4f1c949..1a6ba0a 100644 --- a/crates/libtest2-mimic/tests/testsuite/mixed_bag.rs +++ b/crates/libtest2-mimic/tests/testsuite/mixed_bag.rs @@ -50,12 +50,12 @@ fn check(args: &[&str], code: i32, single: &str, parallel: &str) { .args(["--test-threads", "1"]) .assert() .code(code) - .stdout_matches(single); + .stdout_eq_(single); test_cmd() .args(args) .assert() .code(code) - .stdout_matches(parallel); + .stdout_eq_(parallel); } #[test] diff --git a/crates/libtest2-mimic/tests/testsuite/panic.rs b/crates/libtest2-mimic/tests/testsuite/panic.rs index f1a3413..31144d1 100644 --- a/crates/libtest2-mimic/tests/testsuite/panic.rs +++ b/crates/libtest2-mimic/tests/testsuite/panic.rs @@ -28,12 +28,12 @@ fn check(args: &[&str], code: i32, single: &str, parallel: &str) { .args(["--test-threads", "1"]) .assert() .code(code) - .stdout_matches(single); + .stdout_eq_(single); test_cmd() .args(args) .assert() .code(code) - .stdout_matches(parallel); + .stdout_eq_(parallel); } #[test] diff --git a/crates/libtest2/tests/testsuite/all_passing.rs b/crates/libtest2/tests/testsuite/all_passing.rs index 657881f..221f2ab 100644 --- a/crates/libtest2/tests/testsuite/all_passing.rs +++ b/crates/libtest2/tests/testsuite/all_passing.rs @@ -32,12 +32,12 @@ fn check(args: &[&str], single: &str, parallel: &str) { .args(["--test-threads", "1"]) .assert() .success() - .stdout_matches(single); + .stdout_eq_(single); test_cmd() .args(args) .assert() .success() - .stdout_matches(parallel); + .stdout_eq_(parallel); } #[test] diff --git a/crates/libtest2/tests/testsuite/mixed_bag.rs b/crates/libtest2/tests/testsuite/mixed_bag.rs index 9e354b4..529eb55 100644 --- a/crates/libtest2/tests/testsuite/mixed_bag.rs +++ b/crates/libtest2/tests/testsuite/mixed_bag.rs @@ -57,12 +57,12 @@ fn check(args: &[&str], code: i32, single: &str, parallel: &str) { .args(["--test-threads", "1"]) .assert() .code(code) - .stdout_matches(single); + .stdout_eq_(single); test_cmd() .args(args) .assert() .code(code) - .stdout_matches(parallel); + .stdout_eq_(parallel); } #[test] diff --git a/crates/libtest2/tests/testsuite/panic.rs b/crates/libtest2/tests/testsuite/panic.rs index f672a7f..59868ed 100644 --- a/crates/libtest2/tests/testsuite/panic.rs +++ b/crates/libtest2/tests/testsuite/panic.rs @@ -28,12 +28,12 @@ fn check(args: &[&str], code: i32, single: &str, parallel: &str) { .args(["--test-threads", "1"]) .assert() .code(code) - .stdout_matches(single); + .stdout_eq_(single); test_cmd() .args(args) .assert() .code(code) - .stdout_matches(parallel); + .stdout_eq_(parallel); } #[test] From 5e3e86aa00e2a65489283c98b8d92cb1c28b206c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Jun 2025 00:29:36 +0000 Subject: [PATCH 3/4] chore(deps): Update Rust crate snapbox to 0.6.0 --- Cargo.lock | 4 ++-- crates/libtest2-mimic/Cargo.toml | 2 +- crates/libtest2/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae8b55f..9d30f8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -249,9 +249,9 @@ checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" [[package]] name = "snapbox" -version = "0.5.14" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f37d101fcafc8e73748fd8a1b7048f5979f93d372fd17027d7724c1643bc379b" +checksum = "96dcfc4581e3355d70ac2ee14cfdf81dce3d85c85f1ed9e2c1d3013f53b3436b" dependencies = [ "anstream", "anstyle", diff --git a/crates/libtest2-mimic/Cargo.toml b/crates/libtest2-mimic/Cargo.toml index 4d19605..787b951 100644 --- a/crates/libtest2-mimic/Cargo.toml +++ b/crates/libtest2-mimic/Cargo.toml @@ -37,7 +37,7 @@ dunce = "1.0.4" escargot = "0.5.8" once_cell_polyfill = "1.56.0" pathdiff = "0.2.1" -snapbox = "0.5.0" +snapbox = "0.6.0" [lints] workspace = true diff --git a/crates/libtest2/Cargo.toml b/crates/libtest2/Cargo.toml index 01da651..6a66c87 100644 --- a/crates/libtest2/Cargo.toml +++ b/crates/libtest2/Cargo.toml @@ -37,7 +37,7 @@ dunce = "1.0.4" escargot = "0.5.8" once_cell_polyfill = "1.56.0" pathdiff = "0.2.1" -snapbox = "0.5.0" +snapbox = "0.6.0" [lints] workspace = true From 2111e59214dacff6b749891129c752a84944a841 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 2 Jun 2025 10:27:21 -0500 Subject: [PATCH 4/4] refactor: Resolve deprecations --- crates/libtest2-mimic/tests/testsuite/all_passing.rs | 8 ++------ crates/libtest2-mimic/tests/testsuite/main_thread.rs | 2 +- crates/libtest2-mimic/tests/testsuite/mixed_bag.rs | 4 ++-- crates/libtest2-mimic/tests/testsuite/panic.rs | 4 ++-- crates/libtest2/tests/testsuite/all_passing.rs | 8 ++------ crates/libtest2/tests/testsuite/mixed_bag.rs | 4 ++-- crates/libtest2/tests/testsuite/panic.rs | 4 ++-- 7 files changed, 13 insertions(+), 21 deletions(-) diff --git a/crates/libtest2-mimic/tests/testsuite/all_passing.rs b/crates/libtest2-mimic/tests/testsuite/all_passing.rs index cd40c12..4a9f681 100644 --- a/crates/libtest2-mimic/tests/testsuite/all_passing.rs +++ b/crates/libtest2-mimic/tests/testsuite/all_passing.rs @@ -29,12 +29,8 @@ fn check(args: &[&str], single: &str, parallel: &str) { .args(["--test-threads", "1"]) .assert() .success() - .stdout_eq_(single); - test_cmd() - .args(args) - .assert() - .success() - .stdout_eq_(parallel); + .stdout_eq(single); + test_cmd().args(args).assert().success().stdout_eq(parallel); } #[test] diff --git a/crates/libtest2-mimic/tests/testsuite/main_thread.rs b/crates/libtest2-mimic/tests/testsuite/main_thread.rs index dcec069..f303e87 100644 --- a/crates/libtest2-mimic/tests/testsuite/main_thread.rs +++ b/crates/libtest2-mimic/tests/testsuite/main_thread.rs @@ -22,7 +22,7 @@ fn main() { .current_dir(package_root) .assert() .success() - .stdout_eq_( + .stdout_eq( " running 1 test ...", diff --git a/crates/libtest2-mimic/tests/testsuite/mixed_bag.rs b/crates/libtest2-mimic/tests/testsuite/mixed_bag.rs index 1a6ba0a..2957af9 100644 --- a/crates/libtest2-mimic/tests/testsuite/mixed_bag.rs +++ b/crates/libtest2-mimic/tests/testsuite/mixed_bag.rs @@ -50,12 +50,12 @@ fn check(args: &[&str], code: i32, single: &str, parallel: &str) { .args(["--test-threads", "1"]) .assert() .code(code) - .stdout_eq_(single); + .stdout_eq(single); test_cmd() .args(args) .assert() .code(code) - .stdout_eq_(parallel); + .stdout_eq(parallel); } #[test] diff --git a/crates/libtest2-mimic/tests/testsuite/panic.rs b/crates/libtest2-mimic/tests/testsuite/panic.rs index 31144d1..e4006bf 100644 --- a/crates/libtest2-mimic/tests/testsuite/panic.rs +++ b/crates/libtest2-mimic/tests/testsuite/panic.rs @@ -28,12 +28,12 @@ fn check(args: &[&str], code: i32, single: &str, parallel: &str) { .args(["--test-threads", "1"]) .assert() .code(code) - .stdout_eq_(single); + .stdout_eq(single); test_cmd() .args(args) .assert() .code(code) - .stdout_eq_(parallel); + .stdout_eq(parallel); } #[test] diff --git a/crates/libtest2/tests/testsuite/all_passing.rs b/crates/libtest2/tests/testsuite/all_passing.rs index 221f2ab..912b529 100644 --- a/crates/libtest2/tests/testsuite/all_passing.rs +++ b/crates/libtest2/tests/testsuite/all_passing.rs @@ -32,12 +32,8 @@ fn check(args: &[&str], single: &str, parallel: &str) { .args(["--test-threads", "1"]) .assert() .success() - .stdout_eq_(single); - test_cmd() - .args(args) - .assert() - .success() - .stdout_eq_(parallel); + .stdout_eq(single); + test_cmd().args(args).assert().success().stdout_eq(parallel); } #[test] diff --git a/crates/libtest2/tests/testsuite/mixed_bag.rs b/crates/libtest2/tests/testsuite/mixed_bag.rs index 529eb55..82ccf52 100644 --- a/crates/libtest2/tests/testsuite/mixed_bag.rs +++ b/crates/libtest2/tests/testsuite/mixed_bag.rs @@ -57,12 +57,12 @@ fn check(args: &[&str], code: i32, single: &str, parallel: &str) { .args(["--test-threads", "1"]) .assert() .code(code) - .stdout_eq_(single); + .stdout_eq(single); test_cmd() .args(args) .assert() .code(code) - .stdout_eq_(parallel); + .stdout_eq(parallel); } #[test] diff --git a/crates/libtest2/tests/testsuite/panic.rs b/crates/libtest2/tests/testsuite/panic.rs index 59868ed..a9af8bf 100644 --- a/crates/libtest2/tests/testsuite/panic.rs +++ b/crates/libtest2/tests/testsuite/panic.rs @@ -28,12 +28,12 @@ fn check(args: &[&str], code: i32, single: &str, parallel: &str) { .args(["--test-threads", "1"]) .assert() .code(code) - .stdout_eq_(single); + .stdout_eq(single); test_cmd() .args(args) .assert() .code(code) - .stdout_eq_(parallel); + .stdout_eq(parallel); } #[test]