fluencelabs/marine
1
0
Fork 0
mirror of https://github.com/fluencelabs/marine.git synced 2025-06-24 04:01:37 +00:00
Code Issues Projects Releases Wiki Activity

move to wasmer-it 0.20.2 (#110)

Browse Source
This commit is contained in:
Mike Voronov
2021-09-03 20:10:44 +03:00
committed by GitHub
parent 8d2b37b1b5
commit c54975bef0
8 changed files with 58 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
Cargo.lock generated
View File

@ -745,7 +745,7 @@ dependencies = [
"env_logger 0.7.1", "env_logger 0.7.1",
"itertools 0.9.0", "itertools 0.9.0",
"log", "log",
"marine-module-interface 0.1.4", "marine-module-interface 0.1.5",
"marine-rs-sdk", "marine-rs-sdk",
"marine-rs-sdk-main", "marine-rs-sdk-main",
"marine-runtime 0.7.0", "marine-runtime 0.7.0",
@ -773,7 +773,7 @@ dependencies = [
"cmd_lib", "cmd_lib",
"itertools 0.9.0", "itertools 0.9.0",
"log", "log",
"marine-module-interface 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "marine-module-interface 0.1.4",
"marine-rs-sdk", "marine-rs-sdk",
"marine-rs-sdk-main", "marine-rs-sdk-main",
"marine-runtime 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "marine-runtime 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1027,7 +1027,7 @@ dependencies = [
"indexmap", "indexmap",
"slab", "slab",
"tokio 1.11.0", "tokio 1.11.0",
"tokio-util 0.6.7", "tokio-util 0.6.8",
"tracing", "tracing",
] ]
@ -1408,7 +1408,7 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
[[package]] [[package]]
name = "marine" name = "marine"
version = "0.6.10" version = "0.6.11"
dependencies = [ dependencies = [
"Inflector", "Inflector",
"anyhow", "anyhow",
@ -1416,8 +1416,8 @@ dependencies = [
"check-latest", "check-latest",
"clap", "clap",
"exitfailure", "exitfailure",
"marine-it-generator 0.5.3", "marine-it-generator 0.5.4",
"marine-it-parser 0.6.5", "marine-it-parser 0.6.6",
"marine-module-info-parser 0.2.0", "marine-module-info-parser 0.2.0",
"semver 0.11.0", "semver 0.11.0",
"serde", "serde",
@ -1430,6 +1430,8 @@ dependencies = [
[[package]] [[package]]
name = "marine-it-generator" name = "marine-it-generator"
version = "0.5.3" version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e62f29b16bbdb0763a04f8561c954624ee9cd9f558af4e67b95eb00880da11ec"
dependencies = [ dependencies = [
"cargo_toml", "cargo_toml",
"it-lilo", "it-lilo",
@ -1445,13 +1447,11 @@ dependencies = [
[[package]] [[package]]
name = "marine-it-generator" name = "marine-it-generator"
version = "0.5.3" version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e62f29b16bbdb0763a04f8561c954624ee9cd9f558af4e67b95eb00880da11ec"
dependencies = [ dependencies = [
"cargo_toml", "cargo_toml",
"it-lilo", "it-lilo",
"marine-it-parser 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "marine-it-parser 0.6.6",
"marine-macro-impl", "marine-macro-impl",
"once_cell", "once_cell",
"serde", "serde",
@ -1461,14 +1461,6 @@ dependencies = [
"wasmer-interface-types-fl", "wasmer-interface-types-fl",
] ]
[[package]]
name = "marine-it-interfaces"
version = "0.4.0"
dependencies = [
"multimap",
"wasmer-interface-types-fl",
]
[[package]] [[package]]
name = "marine-it-interfaces" name = "marine-it-interfaces"
version = "0.4.0" version = "0.4.0"
@ -1479,9 +1471,19 @@ dependencies = [
"wasmer-interface-types-fl", "wasmer-interface-types-fl",
] ]
[[package]]
name = "marine-it-interfaces"
version = "0.4.1"
dependencies = [
"multimap",
"wasmer-interface-types-fl",
]
[[package]] [[package]]
name = "marine-it-parser" name = "marine-it-parser"
version = "0.6.5" version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19a6606e472587b2e7b759b16d037a4ea951facc2a6650f668f22403978c2442"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"itertools 0.10.1", "itertools 0.10.1",
@ -1498,14 +1500,12 @@ dependencies = [
[[package]] [[package]]
name = "marine-it-parser" name = "marine-it-parser"
version = "0.6.5" version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19a6606e472587b2e7b759b16d037a4ea951facc2a6650f668f22403978c2442"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"itertools 0.10.1", "itertools 0.10.1",
"marine-it-interfaces 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "marine-it-interfaces 0.4.1",
"marine-module-interface 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "marine-module-interface 0.1.5",
"nom", "nom",
"semver 0.11.0", "semver 0.11.0",
"serde", "serde",
@ -1571,6 +1571,8 @@ dependencies = [
[[package]] [[package]]
name = "marine-module-interface" name = "marine-module-interface"
version = "0.1.4" version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8a5936273bebb523ed169863282dbc19fc66bb983c7031c5b8b0556584f2401"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"itertools 0.10.1", "itertools 0.10.1",
@ -1586,13 +1588,11 @@ dependencies = [
[[package]] [[package]]
name = "marine-module-interface" name = "marine-module-interface"
version = "0.1.4" version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8a5936273bebb523ed169863282dbc19fc66bb983c7031c5b8b0556584f2401"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"itertools 0.10.1", "itertools 0.10.1",
"marine-it-interfaces 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "marine-it-interfaces 0.4.1",
"nom", "nom",
"semver 0.11.0", "semver 0.11.0",
"serde", "serde",
@ -1647,11 +1647,11 @@ dependencies = [
"bytes 0.5.6", "bytes 0.5.6",
"it-lilo", "it-lilo",
"log", "log",
"marine-it-generator 0.5.3", "marine-it-generator 0.5.4",
"marine-it-interfaces 0.4.0", "marine-it-interfaces 0.4.1",
"marine-it-parser 0.6.5", "marine-it-parser 0.6.6",
"marine-module-info-parser 0.2.0", "marine-module-info-parser 0.2.0",
"marine-module-interface 0.1.4", "marine-module-interface 0.1.5",
"marine-utils 0.2.0", "marine-utils 0.2.0",
"multimap", "multimap",
"once_cell", "once_cell",
@ -1679,11 +1679,11 @@ dependencies = [
"boolinator", "boolinator",
"it-lilo", "it-lilo",
"log", "log",
"marine-it-generator 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "marine-it-generator 0.5.3",
"marine-it-interfaces 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "marine-it-interfaces 0.4.0",
"marine-it-parser 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "marine-it-parser 0.6.5",
"marine-module-info-parser 0.2.0 (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-module-interface 0.1.4",
"marine-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "marine-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"multimap", "multimap",
"once_cell", "once_cell",
@ -1730,7 +1730,7 @@ dependencies = [
"darling 0.12.4", "darling 0.12.4",
"fluence-app-service 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fluence-app-service 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools 0.10.1", "itertools 0.10.1",
"marine-it-parser 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "marine-it-parser 0.6.5",
"proc-macro-error", "proc-macro-error",
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3049,9 +3049,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio-util" name = "tokio-util"
version = "0.6.7" version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592" checksum = "08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd"
dependencies = [ dependencies = [
"bytes 1.1.0", "bytes 1.1.0",
"futures-core", "futures-core",
@ -3129,9 +3129,9 @@ dependencies = [
[[package]] [[package]]
name = "typenum" name = "typenum"
version = "1.13.0" version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
[[package]] [[package]]
name = "typetag" name = "typetag"
@ -3476,9 +3476,9 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-interface-types-fl" name = "wasmer-interface-types-fl"
version = "0.20.1" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df960871d756f87237e7630daa0e8453dd48f9e44e0f214e795362a6daa04967" checksum = "14ba3b5a07989987994b96bf5cc7ac2947005f9ff6123d71b7064232f07d28fa"
dependencies = [ dependencies = [
"fluence-it-types", "fluence-it-types",
"it-lilo", "it-lilo",

6
crates/it-generator/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-it-generator" name = "marine-it-generator"
description = "Fluence Marine interface types generator" description = "Fluence Marine interface types generator"
version = "0.5.3" version = "0.5.4"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -11,10 +11,10 @@ name = "marine_it_generator"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
marine-it-parser = { path = "../it-parser", version = "0.6.4"} marine-it-parser = { path = "../it-parser", version = "0.6.5"}
marine-macro-impl = "0.6.10" marine-macro-impl = "0.6.10"
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.0" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.2" }
it-lilo = "0.1.0" it-lilo = "0.1.0"
thiserror = "1.0.24" thiserror = "1.0.24"

4
crates/it-interfaces/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-it-interfaces" name = "marine-it-interfaces"
description = "Fluence Marine interface types helper crate" description = "Fluence Marine interface types helper crate"
version = "0.4.0" version = "0.4.1"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -11,5 +11,5 @@ name = "marine_it_interfaces"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.0" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.2" }
multimap = "0.8.1" multimap = "0.8.1"

6
crates/it-parser/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-it-parser" name = "marine-it-parser"
description = "Fluence Marine interface types parser" description = "Fluence Marine interface types parser"
version = "0.6.5" version = "0.6.6"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -11,13 +11,13 @@ name = "marine_it_parser"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
marine-it-interfaces = { path = "../it-interfaces", version = "0.4.0" } marine-it-interfaces = { path = "../it-interfaces", version = "0.4.1" }
marine-module-interface = { path = "../module-interface", version = "0.1.4" } marine-module-interface = { path = "../module-interface", version = "0.1.4" }
anyhow = "1.0.31" anyhow = "1.0.31"
walrus = "0.18.0" walrus = "0.18.0"
wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1"} wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1"}
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.0" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.2" }
nom = "5.1" nom = "5.1"
itertools = "0.10.0" itertools = "0.10.0"

7
crates/module-interface/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-module-interface" name = "marine-module-interface"
description = "Fluence Marine module interface" description = "Fluence Marine module interface"
version = "0.1.4" version = "0.1.5"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -11,13 +11,12 @@ name = "marine_module_interface"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
marine-it-interfaces = { path = "../it-interfaces", version = "0.4.0" } marine-it-interfaces = { path = "../it-interfaces", version = "0.4.1" }
#marine-it-generator = { path = "../it-generator", verision = "0.5.2"}
anyhow = "1.0.31" anyhow = "1.0.31"
walrus = "0.18.0" walrus = "0.18.0"
wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1"} wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1"}
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.0" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.2" }
nom = "5.1" nom = "5.1"
itertools = "0.10.0" itertools = "0.10.0"

2
fluence-faas/Cargo.toml
View File

@ -17,7 +17,7 @@ wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" }
# dynamicfunc-fat-closures allows using state inside DynamicFunc # dynamicfunc-fat-closures allows using state inside DynamicFunc
wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1", 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-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" }
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.0" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.2" }
toml = "0.5.6" toml = "0.5.6"
serde = { version = "=1.0.118", features = ["derive"] } serde = { version = "=1.0.118", features = ["derive"] }

2
runtime/Cargo.toml
View File

@ -21,7 +21,7 @@ marine-utils = { path = "../crates/utils", version = "0.2.0" }
wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" } wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" }
# dynamicfunc-fat-closures allows using state inside DynamicFunc # dynamicfunc-fat-closures allows using state inside DynamicFunc
wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1", 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" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.2" }
it-lilo = "0.1.0" it-lilo = "0.1.0"
wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" } wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" }

6
tools/cli/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine" name = "marine"
description = "Fluence Marine command line tool" description = "Fluence Marine command line tool"
version = "0.6.10" version = "0.6.11"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
repository = "https://github.com/fluencelabs/marine/tools/cli" repository = "https://github.com/fluencelabs/marine/tools/cli"
license = "Apache-2.0" license = "Apache-2.0"
@ -12,8 +12,8 @@ name = "marine"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
marine-it-generator = { path = "../../crates/it-generator", version = "0.5.3" } marine-it-generator = { path = "../../crates/it-generator", version = "0.5.4" }
marine-it-parser = { path = "../../crates/it-parser", version = "0.6.5" } marine-it-parser = { path = "../../crates/it-parser", version = "0.6.6" }
marine-module-info-parser = { path = "../../crates/module-info-parser", version = "0.2.0" } marine-module-info-parser = { path = "../../crates/module-info-parser", version = "0.2.0" }
semver = "0.11.0" semver = "0.11.0"