diff --git a/Cargo.lock b/Cargo.lock index 78d57efb..75d8d047 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -89,9 +89,11 @@ dependencies = [ "air-interpreter-interface", "air-utils", "aquavm-air-parser", + "newtype_derive", + "num-traits", "once_cell", "polyplets", - "semver", + "semver 1.0.17", "serde", "serde_json", "tracing", @@ -127,7 +129,7 @@ dependencies = [ "itertools", "lalrpop", "lalrpop-util", - "multimap", + "multimap 0.9.0", "regex", "serde", "serde_json", @@ -153,7 +155,7 @@ dependencies = [ "marine-rs-sdk", "object-pool", "once_cell", - "semver", + "semver 1.0.17", "serde", "serde_json", ] @@ -184,6 +186,7 @@ dependencies = [ "aquavm-air-parser", "bimap", "log", + "num-traits", "polyplets", "serde_json", "thiserror", @@ -260,7 +263,7 @@ dependencies = [ "once_cell", "polyplets", "pretty_assertions 0.6.1", - "semver", + "semver 1.0.17", "serde", "serde_json", "strum", @@ -302,7 +305,7 @@ dependencies = [ "itertools", "lalrpop", "lalrpop-util", - "multimap", + "multimap 0.9.0", "non-empty-vec", "regex", "serde", @@ -1831,10 +1834,10 @@ dependencies = [ "marine-utils", "marine-wasm-backend-traits", "marine-wasmtime-backend", - "multimap", + "multimap 0.8.3", "once_cell", "paste", - "semver", + "semver 1.0.17", "serde", "thiserror", "wasmer-interface-types-fl", @@ -1863,7 +1866,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02fdf6c3d6ff2875d9c6c0ffc9cdde80ad22a4d61a1b4312d5c7ee83b2b7e273" dependencies = [ - "multimap", + "multimap 0.8.3", "wasmer-interface-types-fl", ] @@ -1879,7 +1882,7 @@ dependencies = [ "marine-module-interface", "marine-wasm-backend-traits", "nom", - "semver", + "semver 1.0.17", "serde", "thiserror", "walrus", @@ -1916,7 +1919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a501fd122de0e7ffd4b97ed0431a7ff55c09aaab0ac72486d09cdd0b9555b32" dependencies = [ "once_cell", - "semver", + "semver 1.0.17", ] [[package]] @@ -1929,7 +1932,7 @@ dependencies = [ "chrono", "marine-rs-sdk-main", "marine-wasm-backend-traits", - "semver", + "semver 1.0.17", "serde", "thiserror", "walrus", @@ -1945,7 +1948,7 @@ dependencies = [ "itertools", "marine-it-interfaces", "nom", - "semver", + "semver 1.0.17", "serde", "thiserror", "walrus", @@ -2028,7 +2031,7 @@ checksum = "1a31fcefa80ee7d067b22456fa834dd64b2f82de0443cfb7f51ef7df83f9255a" dependencies = [ "anyhow", "it-memory-traits", - "multimap", + "multimap 0.8.3", "paste", "thiserror", "wasmer-interface-types-fl", @@ -2045,7 +2048,7 @@ dependencies = [ "it-memory-traits", "log", "marine-wasm-backend-traits", - "multimap", + "multimap 0.8.3", "paste", "wasmer-interface-types-fl", "wasmtime", @@ -2153,12 +2156,30 @@ dependencies = [ "serde", ] +[[package]] +name = "multimap" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70db9248a93dc36a36d9a47898caa007a32755c7ad140ec64eeeb50d5a730631" +dependencies = [ + "serde", +] + [[package]] name = "new_debug_unreachable" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +[[package]] +name = "newtype_derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac8cd24d9f185bb7223958d8c1ff7a961b74b1953fd05dba7cc568a63b3861ec" +dependencies = [ + "rustc_version", +] + [[package]] name = "nom" version = "7.1.3" @@ -2625,6 +2646,15 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +[[package]] +name = "rustc_version" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084" +dependencies = [ + "semver 0.1.20", +] + [[package]] name = "rustix" version = "0.36.8" @@ -2680,6 +2710,12 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +[[package]] +name = "semver" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" + [[package]] name = "semver" version = "1.0.17" @@ -3382,7 +3418,7 @@ dependencies = [ "log", "nom", "safe-transmute", - "semver", + "semver 1.0.17", "serde", "serde_json", "thiserror", diff --git a/crates/air-lib/air-parser/Cargo.toml b/crates/air-lib/air-parser/Cargo.toml index e592aa91..aedff9af 100644 --- a/crates/air-lib/air-parser/Cargo.toml +++ b/crates/air-lib/air-parser/Cargo.toml @@ -25,7 +25,7 @@ lalrpop-util = "0.19.8" regex = "1.7.3" codespan = "0.11.1" codespan-reporting = "0.11.1" -multimap = "0.8.3" +multimap = "0.9.0" # TODO: hide serde behind a feature serde = { version = "1.0.158", features = ["rc", "derive"] } diff --git a/crates/air-lib/lambda/parser/Cargo.toml b/crates/air-lib/lambda/parser/Cargo.toml index 9ee02de9..239acfaa 100644 --- a/crates/air-lib/lambda/parser/Cargo.toml +++ b/crates/air-lib/lambda/parser/Cargo.toml @@ -24,7 +24,7 @@ lalrpop-util = "0.19.8" regex = "1.7.3" codespan = "0.11.1" codespan-reporting = "0.11.1" -multimap = "0.8.3" +multimap = "0.9.0" # TODO: hide serde behind a feature serde = { version = "1.0.158", features = ["rc", "derive"] }