From adce192ca355075736ecd00b9b52362bdf130787 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 1 Feb 2023 09:31:38 -0600 Subject: [PATCH] chore: Update dependencies --- Cargo.lock | 69 +++++++++++++++++++++----------- Cargo.toml | 12 +++--- crates/codespell-dict/Cargo.toml | 2 +- crates/misspell-dict/Cargo.toml | 2 +- crates/typos-dict/Cargo.toml | 2 +- crates/typos-vars/Cargo.toml | 2 +- crates/typos/Cargo.toml | 2 +- crates/varcon/Cargo.toml | 2 +- crates/wikipedia-dict/Cargo.toml | 2 +- src/bin/typos-cli/main.rs | 3 +- src/config.rs | 2 +- 11 files changed, 60 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a5ded8..4c63119 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -196,9 +196,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.0" +version = "4.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa91278560fc226a5d9d736cc21e485ff9aad47d26b8ffe1f54cba868b684b9f" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" dependencies = [ "bitflags", "clap_derive 4.1.0", @@ -215,7 +215,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23e2b6c3dcdb73299f48ae05b294da14e2f560b3ed2c09e742269eb1b22af231" dependencies = [ - "clap 4.1.0", + "clap 4.1.4", "log", ] @@ -303,7 +303,7 @@ version = "0.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64a9572308414bfdbda25e41cdd4a15a90e68d93f2d5a66e3ff6e1cdc856f923" dependencies = [ - "clap 4.1.0", + "clap 4.1.4", "concolor", ] @@ -703,12 +703,12 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "globset" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", - "bstr 0.2.17", + "bstr 1.1.0", "fnv", "log", "regex", @@ -772,7 +772,7 @@ dependencies = [ "serde", "serde_derive", "termcolor", - "toml", + "toml 0.5.9", "uuid", ] @@ -1386,6 +1386,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + [[package]] name = "shlex" version = "1.1.0" @@ -1412,9 +1421,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "snapbox" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbd7b250c7243273b5aec4ca366fced84ad716d110bb7baae4814678952ebde" +checksum = "34eced5a65e76d5a00047986a83c65f80dc666faa27b5138f331659e2ca6bcf5" dependencies = [ "concolor", "content_inspector", @@ -1551,32 +1560,44 @@ dependencies = [ ] [[package]] -name = "toml_datetime" -version = "0.5.0" +name = "toml" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808b51e57d0ef8f71115d8f3a01e7d3750d01c79cac4b3eda910f4389fdf92fd" +checksum = "772c1426ab886e7362aedf4abc9c0d1348a979517efedfc25862944d10137af0" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.16.2" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd30deba9a1cd7153c22aecf93e86df639e7b81c622b0af8d9255e989991a7b7" +checksum = "90a238ee2e6ede22fb95350acc78e21dc40da00bb66c0334bde83de4ed89424e" dependencies = [ "indexmap", - "itertools", "nom8", "serde", + "serde_spanned", "toml_datetime", ] [[package]] name = "trycmd" -version = "0.14.6" +version = "0.14.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0b37ad14571d245340fb1d56cec65507bd73571005adc63dc968aa38fa9d49" +checksum = "522dcafb4bf113bcf83e4f47a0499ea1f6798877439e6a0e96cf087a2abe97dc" dependencies = [ "glob", "humantime", @@ -1590,9 +1611,9 @@ dependencies = [ [[package]] name = "typed-arena" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typos" @@ -1619,7 +1640,7 @@ dependencies = [ "assert_fs", "atty", "bstr 1.1.0", - "clap 4.1.0", + "clap 4.1.4", "clap-verbosity-flag", "concolor", "concolor-clap", @@ -1642,7 +1663,7 @@ dependencies = [ "serde", "serde_json", "thread_local", - "toml_edit", + "toml 0.7.1", "trycmd", "typed-arena", "typos", @@ -1742,9 +1763,9 @@ checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" diff --git a/Cargo.toml b/Cargo.toml index b923494..773eeea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,11 +65,11 @@ typos-dict = { version = "^0.9", path = "crates/typos-dict", optional = true } typos-vars = { version = "^0.8", path = "crates/typos-vars", optional = true } unicase = "2.6" anyhow = "1.0" -clap = { version = "4.1.0", features = ["derive"] } +clap = { version = "4.1.4", features = ["derive"] } clap-verbosity-flag = "2.0" ignore = "0.4" serde = { version = "1.0", features = ["derive"] } -toml_edit = { version = "0.16.2", features = ["easy"] } +toml = "0.7.0" log = "0.4" env_logger = { version = "0.10", default-features = false, features = ["auto-color"] } atty = "0.2.14" @@ -83,23 +83,23 @@ difflib = "0.4" proc-exit = "2.0" human-panic = "1.0.3" content_inspector = "0.2.4" -unicode-segmentation = "1.10.0" +unicode-segmentation = "1.10.1" derive_more = "0.99.17" derive_setters = "0.1" itertools = "0.10" serde_json = "1.0" encoding = "0.2" kstring = { version = "2.0.0", features = ["serde"] } -typed-arena = "2.0.1" +typed-arena = "2.0.2" maplit = "1.0" unicode-width = "0.1.10" unic-emoji-char = "0.9.0" thread_local = "1.1.4" -globset = "0.4.9" +globset = "0.4.10" [dev-dependencies] assert_fs = "1.0" -trycmd = "0.14.6" +trycmd = "0.14.11" criterion = "0.4" [profile.dev] diff --git a/crates/codespell-dict/Cargo.toml b/crates/codespell-dict/Cargo.toml index a6c9f18..ff0aed0 100644 --- a/crates/codespell-dict/Cargo.toml +++ b/crates/codespell-dict/Cargo.toml @@ -24,4 +24,4 @@ unicase = "2.6" itertools = "0.10" codegenrs = "2.0" dictgen = { version = "^0.2", path = "../dictgen", features = ["codegen"] } -snapbox = { version = "0.4.3", features = ["path"] } +snapbox = { version = "0.4.4", features = ["path"] } diff --git a/crates/misspell-dict/Cargo.toml b/crates/misspell-dict/Cargo.toml index c2c9a79..5113522 100644 --- a/crates/misspell-dict/Cargo.toml +++ b/crates/misspell-dict/Cargo.toml @@ -24,4 +24,4 @@ itertools = "0.10" codegenrs = "2.0" regex = "1" dictgen = { version = "^0.2", path = "../dictgen", features = ["codegen"] } -snapbox = { version = "0.4.3", features = ["path"] } +snapbox = { version = "0.4.4", features = ["path"] } diff --git a/crates/typos-dict/Cargo.toml b/crates/typos-dict/Cargo.toml index fd24a70..b3a60eb 100644 --- a/crates/typos-dict/Cargo.toml +++ b/crates/typos-dict/Cargo.toml @@ -23,4 +23,4 @@ unicase = "2.6" codegenrs = "2.0" dictgen = { version = "^0.2", path = "../dictgen", features = ["codegen"] } varcon = { version = "^0.6", path = "../varcon" } -snapbox = { version = "0.4.3", features = ["path"] } +snapbox = { version = "0.4.4", features = ["path"] } diff --git a/crates/typos-vars/Cargo.toml b/crates/typos-vars/Cargo.toml index 6a6a3c5..2151e7b 100644 --- a/crates/typos-vars/Cargo.toml +++ b/crates/typos-vars/Cargo.toml @@ -24,4 +24,4 @@ unicase = "2.6" codegenrs = "2.0" itertools = "0.10" dictgen = { version = "^0.2", path = "../dictgen", features = ["codegen"] } -snapbox = { version = "0.4.3", features = ["path"] } +snapbox = { version = "0.4.4", features = ["path"] } diff --git a/crates/typos/Cargo.toml b/crates/typos/Cargo.toml index c442ade..94e4cf1 100644 --- a/crates/typos/Cargo.toml +++ b/crates/typos/Cargo.toml @@ -20,5 +20,5 @@ once_cell = "1.17.0" serde = { version = "1.0", features = ["derive"] } simdutf8 = "0.1.4" itertools = "0.10" -unicode-segmentation = "1.10.0" +unicode-segmentation = "1.10.1" bstr = "1.1" diff --git a/crates/varcon/Cargo.toml b/crates/varcon/Cargo.toml index 8dafc8d..ee6d147 100644 --- a/crates/varcon/Cargo.toml +++ b/crates/varcon/Cargo.toml @@ -22,4 +22,4 @@ varcon-core = { version = "^2.2", path = "../varcon-core" } [dev-dependencies] codegenrs = "2.0" varcon-core = { version = "^2.2", path = "../varcon-core", features = ["parser"] } -snapbox = { version = "0.4.3", features = ["path"] } +snapbox = { version = "0.4.4", features = ["path"] } diff --git a/crates/wikipedia-dict/Cargo.toml b/crates/wikipedia-dict/Cargo.toml index 5b0061c..f51cca0 100644 --- a/crates/wikipedia-dict/Cargo.toml +++ b/crates/wikipedia-dict/Cargo.toml @@ -24,4 +24,4 @@ unicase = "2.6" itertools = "0.10" codegenrs = "2.0" dictgen = { version = "^0.2", path = "../dictgen", features = ["codegen"] } -snapbox = { version = "0.4.3", features = ["path"] } +snapbox = { version = "0.4.4", features = ["path"] } diff --git a/src/bin/typos-cli/main.rs b/src/bin/typos-cli/main.rs index b9aeb91..f0a2215 100644 --- a/src/bin/typos-cli/main.rs +++ b/src/bin/typos-cli/main.rs @@ -90,8 +90,7 @@ fn run_dump_config(args: &args::Args, output_path: &std::path::Path) -> proc_exi let mut defaulted_config = typos_cli::config::Config::from_defaults(); defaulted_config.update(&config); - let output = - toml_edit::easy::to_string_pretty(&defaulted_config).with_code(proc_exit::Code::FAILURE)?; + let output = toml::to_string_pretty(&defaulted_config).with_code(proc_exit::Code::FAILURE)?; if output_path == std::path::Path::new("-") { std::io::stdout() .write_all(output.as_bytes()) diff --git a/src/config.rs b/src/config.rs index 7e0a0da..f150bed 100644 --- a/src/config.rs +++ b/src/config.rs @@ -32,7 +32,7 @@ impl Config { } pub fn from_toml(data: &str) -> Result { - let content = toml_edit::easy::from_str(data)?; + let content = toml::from_str(data)?; Ok(content) }