From 44898d929cbe439ffa2e1da4c3e6ff711c397c51 Mon Sep 17 00:00:00 2001 From: Mike Voronov Date: Thu, 5 Aug 2021 21:17:26 +0300 Subject: [PATCH] move to wasmer 0.17.1 (#104) --- Cargo.lock | 423 ++++++++++++------ crates/it-parser/Cargo.toml | 2 +- crates/module-info-parser/Cargo.toml | 2 +- crates/module-interface/Cargo.toml | 2 +- examples/greeting/Cargo.toml | 2 +- fluence-app-service/Cargo.toml | 4 +- fluence-faas/Cargo.toml | 8 +- runtime/Cargo.toml | 6 +- .../src/host_imports/lifting/lift_ivalues.rs | 2 +- tools/repl/Cargo.toml | 4 +- 10 files changed, 304 insertions(+), 151 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 899a1d10..7b34fa67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,11 +14,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.15.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a2e47a1fbe209ee101dd6d61285226744c6c8d3c21c8dc878ba6cb9f467f3a" +checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" dependencies = [ - "gimli 0.24.0", + "gimli 0.25.0", ] [[package]] @@ -56,9 +56,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.41" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61" +checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" [[package]] name = "arguments-passing-test" @@ -107,9 +107,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7815ea54e4d821e791162e078acbebfd6d8c8939cd559c9335dceb1c8ca7282" +checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01" dependencies = [ "addr2line", "cc", @@ -218,9 +218,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" +checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" [[package]] name = "cfg-if" @@ -242,8 +242,8 @@ checksum = "686b97f42c02048850cf72da8a67a42c094d57f50e216b735d94aad32fd3c4c9" dependencies = [ "anyhow", "chrono", - "reqwest 0.11.3", - "semver 1.0.3", + "reqwest 0.11.4", + "semver 1.0.4", "serde", ] @@ -385,9 +385,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -639,9 +639,9 @@ dependencies = [ [[package]] name = "erased-serde" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5b36e6f2295f393f44894c6031f67df4d185b984cd54d08f768ce678007efcd" +checksum = "3de9ad4541d99dc22b59134e7ff8dc3d6c988c89ecd7324bf10a8362b07a2afa" dependencies = [ "serde", ] @@ -748,6 +748,8 @@ dependencies = [ [[package]] name = "fluence-app-service" version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "499f0a227e1703b5e6c09aa311f08f50964dc111bed67711a5168be2510061fa" dependencies = [ "fluence-faas 0.8.1", "log", @@ -759,6 +761,20 @@ dependencies = [ "wasmer-wasi-fl", ] +[[package]] +name = "fluence-app-service" +version = "0.9.0" +dependencies = [ + "fluence-faas 0.9.0", + "log", + "maplit", + "serde", + "serde_derive", + "serde_json", + "toml", + "wasmer-wasi-fl", +] + [[package]] name = "fluence-faas" version = "0.7.1" @@ -787,15 +803,41 @@ dependencies = [ [[package]] name = "fluence-faas" version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7447056d740ea60a93bbda67c7baedf2a652a65e808f407d2fb0d19de98bf77" +dependencies = [ + "cmd_lib", + "itertools 0.9.0", + "log", + "marine-module-interface 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "marine-rs-sdk", + "marine-rs-sdk-main", + "marine-runtime 0.6.1", + "marine-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "safe-transmute", + "serde", + "serde_derive", + "serde_json", + "thiserror", + "toml", + "wasmer-interface-types-fl", + "wasmer-runtime-core-fl", + "wasmer-runtime-fl", + "wasmer-wasi-fl", +] + +[[package]] +name = "fluence-faas" +version = "0.9.0" dependencies = [ "cmd_lib", "env_logger 0.7.1", "itertools 0.9.0", "log", - "marine-module-interface", + "marine-module-interface 0.1.4", "marine-rs-sdk", "marine-rs-sdk-main", - "marine-runtime", + "marine-runtime 0.7.0", "marine-utils 0.2.0", "once_cell", "pretty_assertions", @@ -919,49 +961,49 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "futures-channel" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" +checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" +checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" [[package]] name = "futures-io" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" +checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" [[package]] name = "futures-sink" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" +checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" [[package]] name = "futures-task" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" +checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" [[package]] name = "futures-util" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" +checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" dependencies = [ "autocfg", "futures-core", "futures-io", "futures-task", "memchr", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.7", "pin-utils", "slab", ] @@ -1055,9 +1097,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189" +checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" [[package]] name = "h2" @@ -1093,16 +1135,16 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.7.0", + "tokio 1.9.0", "tokio-util 0.6.7", "tracing", ] [[package]] name = "hashbrown" -version = "0.9.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" [[package]] name = "heck" @@ -1115,9 +1157,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] @@ -1157,7 +1199,7 @@ checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" dependencies = [ "bytes 1.0.1", "http", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.7", ] [[package]] @@ -1213,9 +1255,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.9" +version = "0.14.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07d6baa1b441335f3ce5098ac421fb6547c46dda735ca1bc6d0153c838f9dd83" +checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11" dependencies = [ "bytes 1.0.1", "futures-channel", @@ -1227,9 +1269,9 @@ dependencies = [ "httparse", "httpdate 1.0.1", "itoa", - "pin-project-lite 0.2.6", - "socket2 0.4.0", - "tokio 1.7.0", + "pin-project-lite 0.2.7", + "socket2 0.4.1", + "tokio 1.9.0", "tower-service", "tracing", "want", @@ -1255,9 +1297,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes 1.0.1", - "hyper 0.14.9", + "hyper 0.14.11", "native-tls", - "tokio 1.7.0", + "tokio 1.9.0", "tokio-native-tls", ] @@ -1286,9 +1328,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" +checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", "hashbrown", @@ -1392,9 +1434,9 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "js-sys" -version = "0.3.51" +version = "0.3.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" +checksum = "ce791b7ca6638aae45be056e068fc756d871eb3b3b10b8efa62d1c9cec616752" dependencies = [ "wasm-bindgen", ] @@ -1436,9 +1478,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.97" +version = "0.2.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" +checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" [[package]] name = "local_storage" @@ -1549,6 +1591,24 @@ dependencies = [ "wasmer-interface-types-fl", ] +[[package]] +name = "marine-it-generator" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e62f29b16bbdb0763a04f8561c954624ee9cd9f558af4e67b95eb00880da11ec" +dependencies = [ + "cargo_toml", + "it-lilo", + "marine-it-parser 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "marine-macro-impl", + "once_cell", + "serde", + "serde_json", + "thiserror", + "walrus", + "wasmer-interface-types-fl", +] + [[package]] name = "marine-it-interfaces" version = "0.3.0" @@ -1567,6 +1627,16 @@ dependencies = [ "wasmer-interface-types-fl", ] +[[package]] +name = "marine-it-interfaces" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f18c137e51fd52ab7a3652233fc4eaa68e25a6a53d609bf9dd0f2e3bf67adee1" +dependencies = [ + "multimap", + "wasmer-interface-types-fl", +] + [[package]] name = "marine-it-parser" version = "0.5.0" @@ -1591,7 +1661,26 @@ dependencies = [ "anyhow", "itertools 0.10.1", "marine-it-interfaces 0.4.0", - "marine-module-interface", + "marine-module-interface 0.1.4", + "nom", + "semver 0.11.0", + "serde", + "thiserror", + "walrus", + "wasmer-interface-types-fl", + "wasmer-runtime-core-fl", +] + +[[package]] +name = "marine-it-parser" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19a6606e472587b2e7b759b16d037a4ea951facc2a6650f668f22403978c2442" +dependencies = [ + "anyhow", + "itertools 0.10.1", + "marine-it-interfaces 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "marine-module-interface 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "nom", "semver 0.11.0", "serde", @@ -1654,6 +1743,22 @@ dependencies = [ "wasmer-runtime-core-fl", ] +[[package]] +name = "marine-module-info-parser" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a0951d77c38171d8b2ddcc888d1153a2c4f777b3b7a7dca093a06c69b32d77" +dependencies = [ + "anyhow", + "chrono", + "marine-rs-sdk-main", + "semver 0.11.0", + "serde", + "thiserror", + "walrus", + "wasmer-runtime-core-fl", +] + [[package]] name = "marine-module-interface" version = "0.1.4" @@ -1671,10 +1776,28 @@ dependencies = [ ] [[package]] -name = "marine-rs-sdk" -version = "0.6.10" +name = "marine-module-interface" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb421eb08e8b8cef726a73a0c10bff45b43c41a85aa965de14487cea373883bb" +checksum = "d8a5936273bebb523ed169863282dbc19fc66bb983c7031c5b8b0556584f2401" +dependencies = [ + "anyhow", + "itertools 0.10.1", + "marine-it-interfaces 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "nom", + "semver 0.11.0", + "serde", + "thiserror", + "walrus", + "wasmer-interface-types-fl", + "wasmer-runtime-core-fl", +] + +[[package]] +name = "marine-rs-sdk" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9157bae63a4bbdd7a29984f6ded08f8ed72991b83ca3bdd59d2f889fa8b8ea02" dependencies = [ "marine-macro", "marine-rs-sdk-main", @@ -1695,11 +1818,11 @@ dependencies = [ [[package]] name = "marine-rs-sdk-test" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827742bef9e5ff2cd4579e36743e24570ded25f481b46d75622bf16aa7385297" +checksum = "d2260a52baf8e3added55773f09dbaad83bc1cc6632aa80ec2038dcc1a4d57d3" dependencies = [ - "fluence-app-service 0.7.1", + "fluence-app-service 0.8.0", "marine-test-macro", "serde", "serde_json", @@ -1709,6 +1832,36 @@ dependencies = [ [[package]] name = "marine-runtime" version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24b5569a55e5cb2b1ba2c647fc827124ba021eec5ddbcb2c86bd4ab348ea96cf" +dependencies = [ + "anyhow", + "boolinator", + "it-lilo", + "log", + "marine-it-generator 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "marine-it-interfaces 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "marine-it-parser 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "marine-module-info-parser 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "marine-module-interface 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "marine-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "multimap", + "once_cell", + "parity-wasm", + "paste", + "pwasm-utils", + "semver 0.11.0", + "serde", + "thiserror", + "wasmer-interface-types-fl", + "wasmer-runtime-core-fl", + "wasmer-runtime-fl", + "wasmer-wasi-fl", +] + +[[package]] +name = "marine-runtime" +version = "0.7.0" dependencies = [ "anyhow", "boolinator", @@ -1719,7 +1872,7 @@ dependencies = [ "marine-it-interfaces 0.4.0", "marine-it-parser 0.6.5", "marine-module-info-parser 0.2.0", - "marine-module-interface", + "marine-module-interface 0.1.4", "marine-utils 0.2.0", "multimap", "once_cell", @@ -1748,9 +1901,9 @@ dependencies = [ [[package]] name = "marine-test-macro" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eac506af11f3e35fa4e3018b7be0247d0c1833e0691efb5a4eb8b01dae168f5" +checksum = "db258922011dff95938e883c95367d0efaa3649743bc0cff51f5ca94b3085cb3" dependencies = [ "marine-test-macro-impl", "proc-macro-error", @@ -1761,12 +1914,12 @@ dependencies = [ [[package]] name = "marine-test-macro-impl" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c3562ea5ecfcab9787fbe6d1e90a5db6717dd54e89143cf59fee3da0a5a4bb" +checksum = "a1cbe9f5c1dc81a975343e1206cabfdf3e5be14a2fc497e34dce8498e57033c2" dependencies = [ "darling 0.12.4", - "fluence-app-service 0.7.1", + "fluence-app-service 0.8.0", "marine-it-parser 0.5.0", "proc-macro-error", "proc-macro2", @@ -1907,13 +2060,13 @@ dependencies = [ [[package]] name = "mrepl" -version = "0.8.0" +version = "0.9.0" dependencies = [ "anyhow", "check-latest", "clap", "env_logger 0.7.1", - "fluence-app-service 0.8.0", + "fluence-app-service 0.9.0", "itertools 0.9.0", "log", "marine-rs-sdk-main", @@ -2059,9 +2212,9 @@ checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" [[package]] name = "object" -version = "0.25.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38f2be3697a57b4060074ff41b44c16870d916ad7877c17696e063257482bc7" +checksum = "c55827317fb4c08822499848a14237d2874d6f139828893017237e7ab93eb386" dependencies = [ "memchr", ] @@ -2074,9 +2227,9 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "openssl" -version = "0.10.34" +version = "0.10.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8" +checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -2094,9 +2247,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.63" +version = "0.9.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98" +checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" dependencies = [ "autocfg", "cc", @@ -2177,18 +2330,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4" +checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f" +checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" dependencies = [ "proc-macro2", "quote", @@ -2203,9 +2356,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" [[package]] name = "pin-utils" @@ -2262,9 +2415,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" +checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" dependencies = [ "unicode-xid", ] @@ -2489,7 +2642,7 @@ dependencies = [ "mime_guess", "native-tls", "percent-encoding", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.7", "serde", "serde_urlencoded", "tokio 0.2.25", @@ -2503,9 +2656,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2296f2fac53979e8ccbc4a1136b25dcefd37be9ed7e4a1f6b05a6029c84ff124" +checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22" dependencies = [ "base64", "bytes 1.0.1", @@ -2514,7 +2667,7 @@ dependencies = [ "futures-util", "http", "http-body 0.4.2", - "hyper 0.14.9", + "hyper 0.14.11", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -2523,11 +2676,11 @@ dependencies = [ "mime", "native-tls", "percent-encoding", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.7", "serde", "serde_json", "serde_urlencoded", - "tokio 1.7.0", + "tokio 1.9.0", "tokio-native-tls", "url", "wasm-bindgen", @@ -2550,9 +2703,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce" +checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" [[package]] name = "rustc_version" @@ -2670,9 +2823,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe" +checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" dependencies = [ "serde", ] @@ -2733,9 +2886,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" dependencies = [ "itoa", "ryu", @@ -2810,9 +2963,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" dependencies = [ "libc", "winapi 0.3.9", @@ -2844,15 +2997,15 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" +checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" dependencies = [ "proc-macro2", "quote", @@ -2861,9 +3014,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" dependencies = [ "proc-macro2", "quote", @@ -2941,18 +3094,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6" +checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" +checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" dependencies = [ "proc-macro2", "quote", @@ -2990,9 +3143,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" dependencies = [ "tinyvec_macros", ] @@ -3023,9 +3176,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ba603c337335df6ba6dd6afc38c38a7d5e1b0c871678439ea973cd62a118e" +checksum = "4b7b349f11a7047e6d1276853e612d152f5e8a352c61917887cc2169e2366b4c" dependencies = [ "autocfg", "bytes 1.0.1", @@ -3033,7 +3186,7 @@ dependencies = [ "memchr", "mio 0.7.13", "num_cpus", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.7", "winapi 0.3.9", ] @@ -3055,7 +3208,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" dependencies = [ "native-tls", - "tokio 1.7.0", + "tokio 1.9.0", ] [[package]] @@ -3092,8 +3245,8 @@ dependencies = [ "futures-core", "futures-sink", "log", - "pin-project-lite 0.2.6", - "tokio 1.7.0", + "pin-project-lite 0.2.7", + "tokio 1.9.0", ] [[package]] @@ -3119,7 +3272,7 @@ checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" dependencies = [ "cfg-if 1.0.0", "log", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.7", "tracing-core", ] @@ -3227,9 +3380,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" +checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" @@ -3278,9 +3431,9 @@ dependencies = [ [[package]] name = "vcpkg" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70455df2fdf4e9bf580a92e443f1eb0303c390d682e2ea817312c9e81f8c3399" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vec_map" @@ -3359,9 +3512,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.74" +version = "0.2.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" +checksum = "b608ecc8f4198fe8680e2ed18eccab5f0cd4caaf3d83516fa5fb2e927fda2586" dependencies = [ "cfg-if 1.0.0", "serde", @@ -3371,9 +3524,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.74" +version = "0.2.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" +checksum = "580aa3a91a63d23aac5b6b267e2d13cb4f363e31dce6c352fca4752ae12e479f" dependencies = [ "bumpalo", "lazy_static", @@ -3386,9 +3539,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.24" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1" +checksum = "16646b21c3add8e13fdb8f20172f8a28c3dbf62f45406bcff0233188226cfe0c" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3398,9 +3551,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.74" +version = "0.2.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" +checksum = "171ebf0ed9e1458810dfcb31f2e766ad6b3a89dbda42d8901f2b268277e5f09c" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3408,9 +3561,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.74" +version = "0.2.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" +checksum = "6c2657dd393f03aa2a659c25c6ae18a13a4048cebd220e147933ea837efc589f" dependencies = [ "proc-macro2", "quote", @@ -3421,9 +3574,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.74" +version = "0.2.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" +checksum = "2e0c4a743a309662d45f4ede961d7afa4ba4131a59a639f29b0069c3798bbcc2" [[package]] name = "wasm-greeting" @@ -3553,9 +3706,9 @@ dependencies = [ [[package]] name = "wasmer-runtime-core-fl" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4630ff544a2d7f76938bcf82ae217e0bd5c9ee078c653459d4f117c2045d315" +checksum = "d0d5ac3e0603e5f0ffaf11cbd854eea7c3b609ab4b676f71968f2bc47f9e3c4a" dependencies = [ "bincode", "blake3", @@ -3582,9 +3735,9 @@ dependencies = [ [[package]] name = "wasmer-runtime-fl" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e855c8942f998a6938e43c1d0bb11b76a60b1c8341e08db36cc36b97b58bb1e9" +checksum = "5688460204d9f644d846300d041632cf34c4b4f83a955c0a67e600030376d2ee" dependencies = [ "lazy_static", "memmap", @@ -3649,9 +3802,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.51" +version = "0.3.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" +checksum = "01c70a82d842c9979078c772d4a1344685045f1a5628f677c2b2eab4dd7d2696" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/crates/it-parser/Cargo.toml b/crates/it-parser/Cargo.toml index 7ca7a054..d3e33561 100644 --- a/crates/it-parser/Cargo.toml +++ b/crates/it-parser/Cargo.toml @@ -16,7 +16,7 @@ marine-module-interface = { path = "../module-interface", version = "0.1.4" } anyhow = "1.0.31" walrus = "0.18.0" -wasmer-core = { package = "wasmer-runtime-core-fl", version = "0.17.0"} +wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1"} wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.0" } nom = "5.1" diff --git a/crates/module-info-parser/Cargo.toml b/crates/module-info-parser/Cargo.toml index 6b628f76..fb05fb3a 100644 --- a/crates/module-info-parser/Cargo.toml +++ b/crates/module-info-parser/Cargo.toml @@ -13,7 +13,7 @@ path = "src/lib.rs" [dependencies] marine-rs-sdk-main = "0.6.10" -wasmer-core = { package = "wasmer-runtime-core-fl", version = "0.17.0" } +wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1" } anyhow = "1.0.31" chrono = "0.4.19" diff --git a/crates/module-interface/Cargo.toml b/crates/module-interface/Cargo.toml index 334a3366..317f1964 100644 --- a/crates/module-interface/Cargo.toml +++ b/crates/module-interface/Cargo.toml @@ -16,7 +16,7 @@ marine-it-interfaces = { path = "../it-interfaces", version = "0.4.0" } anyhow = "1.0.31" walrus = "0.18.0" -wasmer-core = { package = "wasmer-runtime-core-fl", version = "0.17.0"} +wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1"} wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.0" } nom = "5.1" diff --git a/examples/greeting/Cargo.toml b/examples/greeting/Cargo.toml index ffe46100..d14b3efd 100644 --- a/examples/greeting/Cargo.toml +++ b/examples/greeting/Cargo.toml @@ -12,7 +12,7 @@ name = "greeting" path = "src/main.rs" [dependencies] -marine-rs-sdk = "0.6.10" +marine-rs-sdk = "0.6.11" [dev-dependencies] marine-rs-sdk-test = "0.1.10" diff --git a/fluence-app-service/Cargo.toml b/fluence-app-service/Cargo.toml index d8dbcdab..4f7825c2 100644 --- a/fluence-app-service/Cargo.toml +++ b/fluence-app-service/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "fluence-app-service" description = "Fluence Application Service" -version = "0.8.0" +version = "0.9.0" authors = ["Fluence Labs"] license = "Apache-2.0" edition = "2018" [dependencies] -fluence-faas = { path = "../fluence-faas", version = "0.8.1" } +fluence-faas = { path = "../fluence-faas", version = "0.9.0" } maplit = "1.0.2" log = "0.4.8" diff --git a/fluence-faas/Cargo.toml b/fluence-faas/Cargo.toml index da5c480e..6c3d7455 100644 --- a/fluence-faas/Cargo.toml +++ b/fluence-faas/Cargo.toml @@ -1,21 +1,21 @@ [package] name = "fluence-faas" description = "Fluence FaaS" -version = "0.8.1" +version = "0.9.0" authors = ["Fluence Labs"] license = "Apache-2.0" edition = "2018" [dependencies] -marine-runtime = { path = "../runtime", version = "0.6.1" } +marine-runtime = { path = "../runtime", version = "0.7.0" } marine-module-interface = { path = "../crates/module-interface", version = "0.1.4" } marine-utils = { path = "../crates/utils", version = "0.2.0" } marine-rs-sdk-main = { version = "0.6.10", features = ["logger"] } marine-rs-sdk = { version = "0.6.10", features = ["logger"] } -wasmer-runtime = { package = "wasmer-runtime-fl", version = "0.17.0" } +wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" } # dynamicfunc-fat-closures allows using state inside DynamicFunc -wasmer-core = { package = "wasmer-runtime-core-fl", version = "0.17.0", features = ["dynamicfunc-fat-closures"] } +wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1", features = ["dynamicfunc-fat-closures"] } wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.0" } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index d3fd77ba..97d2a3da 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "marine-runtime" description = "Marine is the Fluence Compute Runtime" -version = "0.6.1" +version = "0.7.0" authors = ["Fluence Labs"] license = "Apache-2.0" edition = "2018" @@ -18,9 +18,9 @@ marine-it-generator = { path = "../crates/it-generator", version = "0.5.3" } marine-module-interface = { path = "../crates/module-interface", version = "0.1.4" } marine-utils = { path = "../crates/utils", version = "0.2.0" } -wasmer-runtime = { package = "wasmer-runtime-fl", version = "0.17.0" } +wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" } # dynamicfunc-fat-closures allows using state inside DynamicFunc -wasmer-core = { package = "wasmer-runtime-core-fl", version = "0.17.0", features = ["dynamicfunc-fat-closures"] } +wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1", features = ["dynamicfunc-fat-closures"] } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.0" } it-lilo = "0.1.0" wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" } diff --git a/runtime/src/host_imports/lifting/lift_ivalues.rs b/runtime/src/host_imports/lifting/lift_ivalues.rs index 51f38d55..81007073 100644 --- a/runtime/src/host_imports/lifting/lift_ivalues.rs +++ b/runtime/src/host_imports/lifting/lift_ivalues.rs @@ -32,7 +32,7 @@ macro_rules! next_wvalue { { WValue::$wtype(v) => *v, v => return Err(HostImportError::MismatchWValues(WType::$wtype, v.clone())), - }; + } }; } diff --git a/tools/repl/Cargo.toml b/tools/repl/Cargo.toml index d76ee776..f81af32a 100644 --- a/tools/repl/Cargo.toml +++ b/tools/repl/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mrepl" description = "Fluence Marine REPL intended for testing purposes" -version = "0.8.0" +version = "0.9.0" authors = ["Fluence Labs"] repository = "https://github.com/fluencelabs/marine/tools/repl" license = "Apache-2.0" @@ -12,7 +12,7 @@ name = "mrepl" path = "src/main.rs" [dependencies] -fluence-app-service = { path = "../../fluence-app-service", version = "0.8.0", features = ["raw-module-api"] } +fluence-app-service = { path = "../../fluence-app-service", version = "0.9.0", features = ["raw-module-api"] } marine-rs-sdk-main = { version = "0.6.10", features = ["logger"] } anyhow = "1.0.31"