diff --git a/Cargo.lock b/Cargo.lock index 678d3bdff..547b22f01 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -567,11 +567,22 @@ dependencies = [ [[package]] name = "bincode" -version = "1.3.3" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740" dependencies = [ + "bincode_derive", "serde", + "unty", +] + +[[package]] +name = "bincode_derive" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09" +dependencies = [ + "virtue", ] [[package]] @@ -647,15 +658,16 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfgrammar" -version = "0.13.10" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe45e18904af7af10e4312df7c97251e98af98c70f42f1f2587aecfcbee56bf" +checksum = "b5ef80386dea3cda50570f22e1c6a474f0cc688ae220fc584fef354acaf41f2b" dependencies = [ + "bincode", "indexmap", - "lazy_static", "num-traits", + "proc-macro2", + "quote", "regex", - "serde", "vob", ] @@ -710,7 +722,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958c5d6ecf1f214b4c2bbbbf6ab9523a864bd136dcf71a7e8904799acfe1ad47" dependencies = [ "unicode-segmentation", - "unicode-width", + "unicode-width 0.2.2", ] [[package]] @@ -1605,7 +1617,7 @@ version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfe4fbac503b8d1f88e6676011885f34b7174f46e59956bba534ba83abded4df" dependencies = [ - "unicode-width", + "unicode-width 0.2.2", ] [[package]] @@ -2090,54 +2102,60 @@ dependencies = [ [[package]] name = "lrlex" -version = "0.13.10" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71364e868116ee891b0f93559eb9eca5675bec28b22d33c58481e66c3951d7e" +checksum = "6faf26145c0571bcecf7887802d7dc2947154cb438801d6c90ef3633e68b2365" dependencies = [ + "bincode", "cfgrammar", "getopts", - "lazy_static", + "glob", "lrpar", "num-traits", + "prettyplease", + "proc-macro2", "quote", "regex", "regex-syntax", - "serde", + "syn", "vergen", ] [[package]] name = "lrpar" -version = "0.13.10" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b265a81193d94c92d1c9c715498d6fa505bce3f789ceecb24ab5d6fa2dbc71" +checksum = "402f799a7cfbaf548546e16191a15b7abaeb16ac25bbff5ab41fd93d7548d7a9" dependencies = [ "bincode", "cactus", "cfgrammar", "filetime", "indexmap", - "lazy_static", "lrtable", "num-traits", "packedvec", + "prettyplease", + "proc-macro2", + "quote", "regex", - "serde", - "static_assertions", + "syn", + "unicode-width 0.1.14", "vergen", "vob", + "web-time", ] [[package]] name = "lrtable" -version = "0.13.10" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc36d15214ca997a5097845be1f932b7ee6125c36f5c5e55f6c49e027ddeb6de" +checksum = "bcbe6a005a604615ab7aab7d1f74be563e508f5c6e42f85fbf65c38fe1f5f268" dependencies = [ + "bincode", "cfgrammar", "fnv", "num-traits", - "serde", "sparsevec", "vob", ] @@ -2302,8 +2320,8 @@ version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a69e0a534dd2e6aefce319af62a0aa0066a76bdfcec0201dfe02df226bc9ec70" dependencies = [ + "bincode", "num-traits", - "serde", ] [[package]] @@ -2484,8 +2502,8 @@ dependencies = [ [[package]] name = "promql-parser" -version = "0.10.0" -source = "git+https://github.com/ProjectASAP/promql-parser?rev=9fede7eecca923c9882fe256484d00d37f8706cb#9fede7eecca923c9882fe256484d00d37f8706cb" +version = "0.11.1" +source = "git+https://github.com/ProjectASAP/promql-parser?rev=1d1562e91bbfd59eaceade219a9b98ebb07abdfe#1d1562e91bbfd59eaceade219a9b98ebb07abdfe" dependencies = [ "cfgrammar", "chrono", @@ -2810,9 +2828,9 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68b4a8ce3045f0fe173fb5ae3c6b7dcfbec02bfa650bb8618b2301f52af0134d" dependencies = [ + "bincode", "num-traits", "packedvec", - "serde", "vob", ] @@ -2857,12 +2875,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strum" version = "0.26.3" @@ -3126,6 +3138,12 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c" +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + [[package]] name = "unicode-width" version = "0.2.2" @@ -3144,6 +3162,12 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" +[[package]] +name = "unty" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" + [[package]] name = "url" version = "2.5.8" @@ -3190,14 +3214,20 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "virtue" +version = "0.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1" + [[package]] name = "vob" version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc936b5a7202a703aeaf7ce05e7931db2e0c8126813f97db3e9e06d867b0bb38" dependencies = [ + "bincode", "num-traits", - "serde", ] [[package]] diff --git a/crates/frontend-promql/Cargo.toml b/crates/frontend-promql/Cargo.toml index 3303056f5..b7bc12ad6 100644 --- a/crates/frontend-promql/Cargo.toml +++ b/crates/frontend-promql/Cargo.toml @@ -14,7 +14,7 @@ asap-frontend-common = { path = "../frontend-common" } # Shared ProjectASAP parser contract. Keep this immutable revision aligned # with backend parsing and treat newly parsed functions as unsupported until # the frontend lowerer gives them an explicit semantic mapping. -promql-parser = { git = "https://github.com/ProjectASAP/promql-parser", rev = "9fede7eecca923c9882fe256484d00d37f8706cb" } +promql-parser = { git = "https://github.com/ProjectASAP/promql-parser", rev = "1d1562e91bbfd59eaceade219a9b98ebb07abdfe" } [dev-dependencies] asap-types = { path = "../types", features = ["test-support"] }