From 9cd7f834cb6648973a2cf49efb88e5df594930c2 Mon Sep 17 00:00:00 2001 From: Valery Antopol Date: Mon, 7 Aug 2023 14:42:21 +0300 Subject: [PATCH] feat: update marine runtime (#91) * update fluence-app-service and marine-it-parser crates * update Cargo.lock --- Cargo.lock | 114 ++++++++++++++--------- Cargo.toml | 2 +- crates/marine-test-macro-impl/Cargo.toml | 4 +- 3 files changed, 72 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0091dea..3862efd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -37,6 +37,12 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec8ad6edb4840b78c5c3d88de606b22252d552b55f3a4699fbb10fc070ec3049" +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -48,9 +54,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "arrayvec" @@ -119,9 +125,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytesize" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70" +checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" dependencies = [ "serde", ] @@ -207,13 +213,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", "time 0.1.44", @@ -597,9 +603,9 @@ dependencies = [ [[package]] name = "fluence-app-service" -version = "0.25.3" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65da21a3d53a0a97e742e0f8615c5e8cb4d8399afdd1283a5f7ad2303688fcc5" +checksum = "496be506aa31ceae8f6ac2bc4316e68e43401f761b881caa476a11be3c018c9c" dependencies = [ "log", "maplit", @@ -970,12 +976,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "mach" @@ -1001,9 +1004,9 @@ dependencies = [ [[package]] name = "marine-core" -version = "0.20.3" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69b12be64af53a94221f36b11339b60037c0969b6b884839a34acaa96e10ad4" +checksum = "b0f0a655abdfe744939c5ead91885f03f271448b2df15a7cef3caeecc7d7b0a4" dependencies = [ "anyhow", "bytesize", @@ -1030,9 +1033,9 @@ dependencies = [ [[package]] name = "marine-it-generator" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2042bcddb83455ba3bf4619fa732b0d61ae52b66fbfd5f3f39397553474658e" +checksum = "7b0cc0ce2ee4ee0986abf71327b84ef3fb26dcb33b866226f9e659d1cce922fd" dependencies = [ "it-lilo", "marine-it-parser", @@ -1041,7 +1044,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "walrus", + "walrus 0.20.1", "wasmer-interface-types-fl", ] @@ -1057,9 +1060,9 @@ dependencies = [ [[package]] name = "marine-it-parser" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b64614a1221d786babc99ae3c67c1fd051246476e18e107b0d21764da8ac636" +checksum = "52907d7e7b9487a029dd3d99e647307c8808d7fba327e27113b0807d4868b315" dependencies = [ "anyhow", "itertools", @@ -1070,7 +1073,7 @@ dependencies = [ "semver", "serde", "thiserror", - "walrus", + "walrus 0.20.1", "wasmer-interface-types-fl", ] @@ -1120,9 +1123,9 @@ dependencies = [ [[package]] name = "marine-module-info-parser" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0aab6b0bc63685a4d51d7ec5876b8a0330264d72be09f579fb3a71e9eed4076" +checksum = "95e6631ba8cf71539a1a977f2a5f67edf03e7cc322dd23b21bddc4a48e3144c8" dependencies = [ "anyhow", "chrono", @@ -1131,7 +1134,7 @@ dependencies = [ "semver", "serde", "thiserror", - "walrus", + "walrus 0.20.1", ] [[package]] @@ -1147,7 +1150,7 @@ dependencies = [ "semver", "serde", "thiserror", - "walrus", + "walrus 0.19.0", "wasmer-interface-types-fl", ] @@ -1189,9 +1192,9 @@ dependencies = [ [[package]] name = "marine-runtime" -version = "0.26.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c708953e847e0d5e6c3b34952ad8db3884f4b4c88dd89891f03c4ddf91832e" +checksum = "7c3d439aee8f0679f35decb0f50adb45ea1fd4eaf9648f241bcd7ad0be4d6151" dependencies = [ "bytesize", "it-json-serde", @@ -1262,9 +1265,9 @@ checksum = "7e86cb57ff0e2fdc8e188a52d388287d38e5cc781eddd09a82d20f8ee1f48b80" [[package]] name = "marine-wasm-backend-traits" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "251d7e65706b84504680f058d6794331e474f89996fc3d4856b43bad6ca1cf21" +checksum = "8094cd7d1bf6c14ded993fd2d6e6999f7e25c07b2f770277ea28ee64fe433ecc" dependencies = [ "anyhow", "it-memory-traits", @@ -1277,9 +1280,9 @@ dependencies = [ [[package]] name = "marine-wasmtime-backend" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a3cb776b7c3c6d7fce69d8f2332b3a1baabecdcfa7b33a9adec278c968d883" +checksum = "edb895ec13df3b2241b848b3b138569afd3aadd21719af99a2b8aafa5595edec" dependencies = [ "anyhow", "it-memory-traits", @@ -1347,16 +1350,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.14" @@ -1428,9 +1421,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "percent-encoding" @@ -2032,6 +2025,22 @@ dependencies = [ "wasmparser 0.77.0", ] +[[package]] +name = "walrus" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc27d837c587f863d99515dc8cae7cef1098bd1d99fa29373e3660c12766265e" +dependencies = [ + "anyhow", + "gimli", + "id-arena", + "leb128", + "log", + "walrus-macro", + "wasm-encoder 0.29.0", + "wasmparser 0.80.2", +] + [[package]] name = "walrus-macro" version = "0.19.0" @@ -2156,6 +2165,15 @@ dependencies = [ "leb128", ] +[[package]] +name = "wasm-encoder" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" +dependencies = [ + "leb128", +] + [[package]] name = "wasmer-interface-types-fl" version = "0.26.1" @@ -2183,6 +2201,12 @@ version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6" +[[package]] +name = "wasmparser" +version = "0.80.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b" + [[package]] name = "wasmparser" version = "0.100.0" @@ -2424,7 +2448,7 @@ dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder", + "wasm-encoder 0.25.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 6ac47a3..8dfc3f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ trybuild = "1.0" [dependencies] marine-test-macro = { path = "crates/marine-test-macro", version = "=0.10.0" } marine-build-rs-generator = { path = "crates/marine-build-rs-generator", version = "=0.10.0" } -fluence-app-service = { version = "0.25.3", features = ["raw-module-api"] } +fluence-app-service = { version = "0.27.0", features = ["raw-module-api"] } serde = { version = "1.0.162", features = ["derive"] } serde_json = "1.0.96" diff --git a/crates/marine-test-macro-impl/Cargo.toml b/crates/marine-test-macro-impl/Cargo.toml index 757481f..0d8135a 100644 --- a/crates/marine-test-macro-impl/Cargo.toml +++ b/crates/marine-test-macro-impl/Cargo.toml @@ -14,8 +14,8 @@ license = "Apache-2.0" all-features = true [dependencies] -fluence-app-service = { version = "0.25.3", features = ["raw-module-api"] } -marine-it-parser = "0.12.1" +fluence-app-service = { version = "0.27.0", features = ["raw-module-api"] } +marine-it-parser = "0.13.0" itertools = "0.10.5" darling = "0.20.1" quote = "1.0.26"