diff --git a/Cargo.lock b/Cargo.lock index 8c74c3b..abff5af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -60,9 +60,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "assert_cmd" -version = "1.0.8" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe" +checksum = "54f002ce7d0c5e809ebb02be78fd503aeed4a511fd0fcaff6e6914cbdabbfa33" dependencies = [ "bstr", "doc-comment", @@ -412,9 +412,9 @@ dependencies = [ name = "dictgen" version = "0.1.1" dependencies = [ - "phf 0.9.0", + "phf", "phf_codegen", - "phf_shared 0.9.0", + "phf_shared", "unicase", ] @@ -764,6 +764,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "minimal-lexical" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6595bb28ed34f43c3fe088e48f6cfb2e033cab45f25a5384d5fdf564fbc8c4b2" + [[package]] name = "miniz_oxide" version = "0.4.4" @@ -808,6 +814,17 @@ dependencies = [ "version_check", ] +[[package]] +name = "nom" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffd9d26838a953b4af82cbeb9f1592c6798916983959be223a7124e992742c1" +dependencies = [ + "memchr", + "minimal-lexical", + "version_check", +] + [[package]] name = "normalize-line-endings" version = "0.3.0" @@ -871,57 +888,38 @@ dependencies = [ [[package]] name = "phf" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +checksum = "b9fc3db1018c4b59d7d582a739436478b6035138b6aecbce989fc91c3e98409f" dependencies = [ - "phf_shared 0.8.0", -] - -[[package]] -name = "phf" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac8b67553a7ca9457ce0e526948cad581819238f4a9d1ea74545851fa24f37" -dependencies = [ - "phf_shared 0.9.0", + "phf_shared", ] [[package]] name = "phf_codegen" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963adb11cf22ee65dfd401cf75577c1aa0eca58c0b97f9337d2da61d3e640503" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" dependencies = [ "phf_generator", - "phf_shared 0.9.0", + "phf_shared", ] [[package]] name = "phf_generator" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc1437ada0f3a97d538f0bb608137bf53c53969028cab74c89893e1e9a12f0e" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ - "phf_shared 0.9.0", + "phf_shared", "rand", ] [[package]] name = "phf_shared" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", - "unicase", -] - -[[package]] -name = "phf_shared" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a68318426de33640f02be62b4ae8eb1261be2efbc337b60c54d845bf4484e0d9" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ "siphasher", "unicase", @@ -1432,7 +1430,7 @@ dependencies = [ "bstr", "itertools", "log", - "nom", + "nom 7.0.0", "once_cell", "serde", "simdutf8", @@ -1467,7 +1465,6 @@ dependencies = [ "log", "maplit", "once_cell", - "phf 0.8.0", "predicates", "proc-exit", "serde", @@ -1609,7 +1606,7 @@ name = "varcon-core" version = "2.1.1" dependencies = [ "enumflags2", - "nom", + "nom 6.2.1", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index ee1b4ec..d4baef2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,6 @@ typos = { version = "^0.7", path = "crates/typos" } varcon-core = { version = "^2.0.0", path = "crates/varcon-core" } typos-dict = { version = "^0.6", path = "crates/typos-dict", optional = true } typos-vars = { version = "^0.7", path = "crates/typos-vars", optional = true } -phf = { version = "0.8", features = ["unicase"] } unicase = "2.5" anyhow = "1.0" structopt = "0.3" @@ -89,7 +88,7 @@ typed-arena = "2.0.1" [dev-dependencies] assert_fs = "1.0" -assert_cmd = "1.0" +assert_cmd = "2.0" predicates = "2.0" criterion = "0.3" maplit = "1.0" diff --git a/crates/dictgen/Cargo.toml b/crates/dictgen/Cargo.toml index ec4fd33..cd449c6 100644 --- a/crates/dictgen/Cargo.toml +++ b/crates/dictgen/Cargo.toml @@ -16,6 +16,6 @@ map = ["phf", "phf_shared"] [dependencies] unicase = "2.5" -phf = { version = "0.9", features = ["unicase"], optional = true } -phf_codegen = { version = "0.9", optional = true } -phf_shared = { version = "0.9", optional = true } +phf = { version = "0.10", features = ["unicase"], optional = true } +phf_codegen = { version = "0.10", optional = true } +phf_shared = { version = "0.10", optional = true } diff --git a/crates/typos/Cargo.toml b/crates/typos/Cargo.toml index 8cf9d32..0254fa0 100644 --- a/crates/typos/Cargo.toml +++ b/crates/typos/Cargo.toml @@ -16,7 +16,7 @@ codecov = { repository = "crate-ci/typos" } [dependencies] anyhow = "1.0" thiserror = "1.0" -nom = "6.0" +nom = "7.0" unicode-xid = "0.2.2" once_cell = "1.2.0" serde = { version = "1.0", features = ["derive"] }