From f53296c68fb669647529b8a17799e32cc878479f Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 10 Jul 2025 14:17:23 -0500 Subject: [PATCH 1/4] chore: Update trycmd --- Cargo.lock | 66 ++++++++++++++++++++++++++++++++----- crates/typos-cli/Cargo.toml | 2 +- 2 files changed, 58 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b82a1e57..4f95ba6a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1272,6 +1272,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83" +dependencies = [ + "serde", +] + [[package]] name = "shlex" version = "1.2.0" @@ -1445,9 +1454,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" dependencies = [ "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", + "serde_spanned 0.6.8", + "toml_datetime 0.6.9", + "toml_edit 0.22.26", ] [[package]] @@ -1459,6 +1468,15 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3" +dependencies = [ + "serde", +] + [[package]] name = "toml_edit" version = "0.22.27" @@ -1467,12 +1485,36 @@ checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ "indexmap", "serde", - "serde_spanned", - "toml_datetime", + "serde_spanned 0.6.8", + "toml_datetime 0.6.9", "toml_write", "winnow", ] +[[package]] +name = "toml_edit" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54449f7f7569ce6f57cda7812361961c0f6a77f720802537b5618585b4a7ff4c" +dependencies = [ + "indexmap", + "serde", + "serde_spanned 1.0.0", + "toml_datetime 0.7.0", + "toml_parser", + "toml_writer", + "winnow", +] + +[[package]] +name = "toml_parser" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5c1c469eda89749d2230d8156a5969a69ffe0d6d01200581cdc6110674d293e" +dependencies = [ + "winnow", +] + [[package]] name = "toml_write" version = "0.1.2" @@ -1480,10 +1522,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] -name = "trycmd" -version = "0.15.9" +name = "toml_writer" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8b5cf29388862aac065d6597ac9c8e842d1cc827cb50f7c32f11d29442eaae4" +checksum = "b679217f2848de74cabd3e8fc5e6d66f40b7da40f8e1954d92054d9010690fd5" + +[[package]] +name = "trycmd" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "659488a954e37cc663704c169f829952c49b315e2fe5fd375508baffa698f106" dependencies = [ "anstream", "automod", @@ -1494,7 +1542,7 @@ dependencies = [ "serde", "shlex", "snapbox", - "toml_edit", + "toml_edit 0.23.0", ] [[package]] diff --git a/crates/typos-cli/Cargo.toml b/crates/typos-cli/Cargo.toml index 7335b862..72fe6333 100644 --- a/crates/typos-cli/Cargo.toml +++ b/crates/typos-cli/Cargo.toml @@ -85,7 +85,7 @@ assert_fs = "1.1" divan = "0.1.14" maplit = "1.0" snapbox = "0.6.5" -trycmd = "0.15.4" +trycmd = "0.15.10" [[bench]] name = "check_file" From 551e1298ef3651cf045eeedfde921f94c8171608 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 10 Jul 2025 14:18:05 -0500 Subject: [PATCH 2/4] chore: Update human-panic --- Cargo.lock | 20 ++++++++++++++++---- crates/typos-cli/Cargo.toml | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4f95ba6a..617946f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -655,9 +655,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "human-panic" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80b84a66a325082740043a6c28bbea400c129eac0d3a27673a1de971e44bf1f7" +checksum = "ac63a746b187e95d51fe16850eb04d1cfef203f6af98e6c405a6f262ad3df00a" dependencies = [ "anstream", "anstyle", @@ -665,7 +665,7 @@ dependencies = [ "os_info", "serde", "serde_derive", - "toml", + "toml 0.9.1", "uuid", ] @@ -1459,6 +1459,18 @@ dependencies = [ "toml_edit 0.22.26", ] +[[package]] +name = "toml" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0207d6ed1852c2a124c1fbec61621acb8330d2bf969a5d0643131e9affd985a5" +dependencies = [ + "serde", + "serde_spanned 1.0.0", + "toml_datetime 0.7.0", + "toml_writer", +] + [[package]] name = "toml_datetime" version = "0.6.11" @@ -1620,7 +1632,7 @@ dependencies = [ "serde_regex", "snapbox", "thread_local", - "toml", + "toml 0.8.22", "trycmd", "typed-arena", "typos", diff --git a/crates/typos-cli/Cargo.toml b/crates/typos-cli/Cargo.toml index 72fe6333..e9f35a24 100644 --- a/crates/typos-cli/Cargo.toml +++ b/crates/typos-cli/Cargo.toml @@ -58,7 +58,7 @@ bstr = "1.9" ahash = "0.8" difflib = "0.4" proc-exit = "2.0" -human-panic = "2.0.0" +human-panic = "2.0.3" content_inspector = "0.2.4" unicode-segmentation = "1.11.0" derive_more = { version = "2.0", features = ["from", "display"] } From b638e0caaed90952e5e6c46a6fc8be0e4b060aea Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 10 Jul 2025 14:19:00 -0500 Subject: [PATCH 3/4] chore: Update toml --- Cargo.lock | 67 ++++++------------------------------- crates/typos-cli/Cargo.toml | 2 +- 2 files changed, 11 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 617946f5..8d27c297 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -665,7 +665,7 @@ dependencies = [ "os_info", "serde", "serde_derive", - "toml 0.9.1", + "toml", "uuid", ] @@ -1263,15 +1263,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_spanned" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" -dependencies = [ - "serde", -] - [[package]] name = "serde_spanned" version = "1.0.0" @@ -1447,37 +1438,19 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "toml" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" -dependencies = [ - "serde", - "serde_spanned 0.6.8", - "toml_datetime 0.6.9", - "toml_edit 0.22.26", -] - [[package]] name = "toml" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0207d6ed1852c2a124c1fbec61621acb8330d2bf969a5d0643131e9affd985a5" dependencies = [ + "indexmap", "serde", - "serde_spanned 1.0.0", - "toml_datetime 0.7.0", + "serde_spanned", + "toml_datetime", + "toml_parser", "toml_writer", -] - -[[package]] -name = "toml_datetime" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" -dependencies = [ - "serde", + "winnow", ] [[package]] @@ -1489,20 +1462,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.22.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" -dependencies = [ - "indexmap", - "serde", - "serde_spanned 0.6.8", - "toml_datetime 0.6.9", - "toml_write", - "winnow", -] - [[package]] name = "toml_edit" version = "0.23.0" @@ -1511,8 +1470,8 @@ checksum = "54449f7f7569ce6f57cda7812361961c0f6a77f720802537b5618585b4a7ff4c" dependencies = [ "indexmap", "serde", - "serde_spanned 1.0.0", - "toml_datetime 0.7.0", + "serde_spanned", + "toml_datetime", "toml_parser", "toml_writer", "winnow", @@ -1527,12 +1486,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "toml_write" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" - [[package]] name = "toml_writer" version = "1.0.0" @@ -1554,7 +1507,7 @@ dependencies = [ "serde", "shlex", "snapbox", - "toml_edit 0.23.0", + "toml_edit", ] [[package]] @@ -1632,7 +1585,7 @@ dependencies = [ "serde_regex", "snapbox", "thread_local", - "toml 0.8.22", + "toml", "trycmd", "typed-arena", "typos", diff --git a/crates/typos-cli/Cargo.toml b/crates/typos-cli/Cargo.toml index e9f35a24..68db797b 100644 --- a/crates/typos-cli/Cargo.toml +++ b/crates/typos-cli/Cargo.toml @@ -51,7 +51,7 @@ clap = { version = "4.5.4", features = ["derive"] } clap-verbosity-flag = "3.0" ignore = "0.4" serde = { version = "1.0", features = ["derive"] } -toml = "0.8.12" +toml = "0.9.1" log = "0.4" env_logger = { version = "0.11", default-features = false, features = ["auto-color"] } bstr = "1.9" From 42b1689a963ec8df3ad10a241f2817694e90978b Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 10 Jul 2025 14:32:39 -0500 Subject: [PATCH 4/4] chore: Make things consistent across platforms --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..37a33803 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# force LF on checkout to avoid rustfmt messing up the EOL +* text eol=lf