diff --git a/Cargo.lock b/Cargo.lock index 286d307..5248a03 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,6 +62,17 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.41", +] + [[package]] name = "async-trait" version = "0.1.73" @@ -733,6 +744,7 @@ checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", + "futures-executor", "futures-io", "futures-sink", "futures-task", @@ -755,12 +767,34 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + [[package]] name = "futures-io" version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.41", +] + [[package]] name = "futures-sink" version = "0.3.29" @@ -779,11 +813,16 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ + "futures-channel", "futures-core", + "futures-io", + "futures-macro", "futures-sink", "futures-task", + "memchr", "pin-project-lite", "pin-utils", + "slab", ] [[package]] @@ -1029,7 +1068,7 @@ dependencies = [ "serde_derive", "serde_json", "thiserror", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.27.0", ] [[package]] @@ -1040,7 +1079,23 @@ checksum = "20108e77e11eeb1ef019f54c3868e0f2e9227295502f0702fa2e7e730ea748f8" dependencies = [ "anyhow", "fluence-it-types", - "it-memory-traits", + "it-memory-traits 0.4.0", + "log", + "paste", + "thiserror", +] + +[[package]] +name = "it-lilo" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa7310e6ce8b8b6f11c3d0b5dd5824675fab3cfd335f70bcf9a51198de39cfe" +dependencies = [ + "anyhow", + "async-recursion", + "fluence-it-types", + "futures", + "it-memory-traits 0.5.0", "log", "paste", "thiserror", @@ -1055,6 +1110,15 @@ dependencies = [ "thiserror", ] +[[package]] +name = "it-memory-traits" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e83089981169d53e2b13df7c8d132b471bf2fc4c85afe427c4a74115695c4612" +dependencies = [ + "thiserror", +] + [[package]] name = "it-to-bytes" version = "0.1.0" @@ -1228,15 +1292,15 @@ checksum = "2989c1670a82d69724804c7af5d8e4c35231083338806c49485d983f27dd440f" dependencies = [ "anyhow", "bytesize", - "it-lilo", - "it-memory-traits", + "it-lilo 0.6.0", + "it-memory-traits 0.4.0", "log", "marine-it-generator", - "marine-it-interfaces", + "marine-it-interfaces 0.9.1", "marine-it-parser 0.16.0", "marine-min-it-version", "marine-module-info-parser", - "marine-module-interface", + "marine-module-interface 0.8.1", "marine-utils", "marine-wasm-backend-traits 0.6.0", "marine-wasmtime-backend", @@ -1246,7 +1310,7 @@ dependencies = [ "semver", "serde", "thiserror", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.27.0", ] [[package]] @@ -1255,7 +1319,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "993c33c6df3ae978022058dfd63a33b52de1307adec59e0c3f3367dd06bdf342" dependencies = [ - "it-lilo", + "it-lilo 0.6.0", "marine-it-parser 0.16.0", "marine-macro-impl 0.14.0", "once_cell", @@ -1263,7 +1327,7 @@ dependencies = [ "serde_json", "thiserror", "walrus", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.27.0", ] [[package]] @@ -1273,26 +1337,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c610d90a031911c17b2babc32c9fad7261bae6ab0bf118051cd665b5d9bcfbe" dependencies = [ "multimap", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.27.0", ] [[package]] -name = "marine-it-parser" -version = "0.15.1" +name = "marine-it-interfaces" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921afa7f139791b24c4cb91c918d1ef7411ef40c3b801309ec43f6b2c89b107b" +checksum = "34970fe6e4da4fcee6d911e96afb1b99ead0c80e41ba2531a36a1075fbbfb03f" dependencies = [ - "anyhow", - "itertools", - "marine-it-interfaces", - "marine-module-interface", - "marine-wasm-backend-traits 0.5.1", - "nom", - "semver", - "serde", - "thiserror", - "walrus", - "wasmer-interface-types-fl", + "multimap", + "wasmer-interface-types-fl 0.28.0", ] [[package]] @@ -1303,15 +1358,34 @@ checksum = "4fa9ba677486e1f1bf2bfd3e34b259255df277887fa90d5c22acb258bdedc34e" dependencies = [ "anyhow", "itertools", - "marine-it-interfaces", - "marine-module-interface", + "marine-it-interfaces 0.9.1", + "marine-module-interface 0.8.1", "marine-wasm-backend-traits 0.6.0", "nom", "semver", "serde", "thiserror", "walrus", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.27.0", +] + +[[package]] +name = "marine-it-parser" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa3a1f23268aedbe23baed2a3a00ea21bf7b61aa61feb393b70dd0597414cb5e" +dependencies = [ + "anyhow", + "itertools", + "marine-it-interfaces 0.10.0", + "marine-module-interface 0.9.0", + "marine-wasm-backend-traits 0.7.0", + "nom", + "semver", + "serde", + "thiserror", + "walrus", + "wasmer-interface-types-fl 0.28.0", ] [[package]] @@ -1452,13 +1526,30 @@ checksum = "d92d2243bf0d3aea6401d9e57a1ee17677b624337981322e0153cc2d54744080" dependencies = [ "anyhow", "itertools", - "marine-it-interfaces", + "marine-it-interfaces 0.9.1", "nom", "semver", "serde", "thiserror", "walrus", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.27.0", +] + +[[package]] +name = "marine-module-interface" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95e139be29c46e01a1087175834a95881e6e60b1f3304bc10e098450e5bd2b64" +dependencies = [ + "anyhow", + "itertools", + "marine-it-interfaces 0.10.0", + "nom", + "semver", + "serde", + "thiserror", + "walrus", + "wasmer-interface-types-fl 0.28.0", ] [[package]] @@ -1535,14 +1626,14 @@ checksum = "4b524b572fa9c8c1b7a14c30d8e27a339404eeab70531bc9a9e739f1db4bc6af" dependencies = [ "bytesize", "it-json-serde", - "it-memory-traits", + "it-memory-traits 0.4.0", "itertools", "log", "marine-call-parameters 0.10.3", "marine-call-parameters 0.12.0", "marine-call-parameters 0.13.0", "marine-core", - "marine-module-interface", + "marine-module-interface 0.8.1", "marine-rs-sdk", "marine-rs-sdk-main 0.14.0", "marine-utils", @@ -1556,7 +1647,7 @@ dependencies = [ "serde_with", "thiserror", "toml", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.27.0", ] [[package]] @@ -1577,7 +1668,7 @@ dependencies = [ "darling", "fluence-app-service", "itertools", - "marine-it-parser 0.15.1", + "marine-it-parser 0.17.0", "marine-macro-testing-utils", "proc-macro-error", "proc-macro2", @@ -1603,21 +1694,6 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fce56bfabfd0af5326ff81c32c8d2261aa03b10e00ea6c165de4ebf8a3f998e4" -[[package]] -name = "marine-wasm-backend-traits" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "220bc47cfabb8b4ab97bf2bd7bbab9738857b69beeda0a1ac5776c600b64bb46" -dependencies = [ - "anyhow", - "it-memory-traits", - "multimap", - "paste", - "thiserror", - "wasmer-interface-types-fl", - "wasmparser 0.101.1", -] - [[package]] name = "marine-wasm-backend-traits" version = "0.6.0" @@ -1625,11 +1701,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50ba17135a13735abfc8fbbb221cd27fb8c607482ec72d7cd8f37315c9fdf6c5" dependencies = [ "anyhow", - "it-memory-traits", + "it-memory-traits 0.4.0", "multimap", "paste", "thiserror", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.27.0", + "wasmparser 0.101.1", +] + +[[package]] +name = "marine-wasm-backend-traits" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e15277ea4420bfd8c3a26aceded5d64c35c416afaedfccc3b21832eb578f6c1d" +dependencies = [ + "anyhow", + "futures", + "it-memory-traits 0.5.0", + "multimap", + "paste", + "thiserror", + "wasmer-interface-types-fl 0.28.0", "wasmparser 0.101.1", ] @@ -1640,12 +1732,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db7a74c532073142ced94fdeaf7a3e84f92ec5ebef5751fbd5516185ae3cf211" dependencies = [ "anyhow", - "it-memory-traits", + "it-memory-traits 0.4.0", "log", "marine-wasm-backend-traits 0.6.0", "multimap", "paste", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.27.0", "wasmtime", "wasmtime-wasi", ] @@ -2142,6 +2234,15 @@ dependencies = [ "marine-rs-sdk-test", ] +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + [[package]] name = "slice-group-by" version = "0.3.1" @@ -2634,8 +2735,8 @@ checksum = "62958478f282fbf2b05c12f9630972bd8194937de1ab22d6a59d43093be32886" dependencies = [ "anyhow", "fluence-it-types", - "it-lilo", - "it-memory-traits", + "it-lilo 0.6.0", + "it-memory-traits 0.4.0", "it-to-bytes", "itertools", "log", @@ -2648,6 +2749,30 @@ dependencies = [ "wast 8.0.0", ] +[[package]] +name = "wasmer-interface-types-fl" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a753426d5a76076aa16a435b5a5f316e3803461f551975d196928bc92e42916" +dependencies = [ + "anyhow", + "fluence-it-types", + "futures", + "it-lilo 0.7.0", + "it-memory-traits 0.5.0", + "it-to-bytes", + "itertools", + "log", + "nom", + "paste", + "safe-transmute", + "semver", + "serde", + "serde_json", + "thiserror", + "wast 8.0.0", +] + [[package]] name = "wasmparser" version = "0.80.2" diff --git a/crates/marine-test-macro-impl/Cargo.toml b/crates/marine-test-macro-impl/Cargo.toml index 36f81f1..019c596 100644 --- a/crates/marine-test-macro-impl/Cargo.toml +++ b/crates/marine-test-macro-impl/Cargo.toml @@ -15,7 +15,7 @@ all-features = true [dependencies] fluence-app-service = { version = "0.35.1", features = ["raw-module-api"] } -marine-it-parser = "0.15.0" +marine-it-parser = "0.17.0" itertools = "0.10.5" darling = "0.20.1" quote = "1.0.26"