fluencelabs/marine
1
0
Fork 0
mirror of https://github.com/fluencelabs/marine.git synced 2025-03-15 14:00:50 +00:00
Code Issues Projects Releases Wiki Activity

bump interface-types crates versions, so overrides do not break anything

Browse Source
This commit is contained in:
Valery Antopol 2022-01-18 03:04:19 +03:00
parent b449e8bd59
commit c3e01e7076
9 changed files with 101 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
Cargo.lock generated
View File

@ -818,7 +818,7 @@ dependencies = [
"serde_json", "serde_json",
"thiserror", "thiserror",
"toml", "toml",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.20.2",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
"wasmer-runtime-fl", "wasmer-runtime-fl",
"wasmer-wasi-fl", "wasmer-wasi-fl",
@ -847,7 +847,7 @@ dependencies = [
"serde_with", "serde_with",
"thiserror", "thiserror",
"toml", "toml",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.21.0",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
"wasmer-runtime-fl", "wasmer-runtime-fl",
"wasmer-wasi-fl", "wasmer-wasi-fl",
@ -856,8 +856,22 @@ dependencies = [
[[package]] [[package]]
name = "fluence-it-types" name = "fluence-it-types"
version = "0.3.1" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "047f670b4807cab8872550a607b1515daff08b3e3bb7576ce8f45971fd811a4e"
dependencies = [ dependencies = [
"it-to-bytes", "it-to-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"nom",
"serde",
"variant_count",
"wast",
]
[[package]]
name = "fluence-it-types"
version = "0.3.1"
source = "git+https://github.com/fluencelabs/interface-types?branch=marine_web_experiments#2e742a9fe1c857f622c4f0d3e105dec548bc53cd"
dependencies = [
"it-to-bytes 0.1.0 (git+https://github.com/fluencelabs/interface-types?branch=marine_web_experiments)",
"nom", "nom",
"serde", "serde",
"variant_count", "variant_count",
@ -1335,8 +1349,21 @@ checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
[[package]] [[package]]
name = "it-lilo" name = "it-lilo"
version = "0.1.0" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99ccf40e1e08f6f47ffbafe3cfb2e3adb721ddde80b178240f038d07dc9652fb"
dependencies = [ dependencies = [
"fluence-it-types", "fluence-it-types 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log",
"paste",
"thiserror",
]
[[package]]
name = "it-lilo"
version = "0.2.0"
source = "git+https://github.com/fluencelabs/interface-types?branch=marine_web_experiments#2e742a9fe1c857f622c4f0d3e105dec548bc53cd"
dependencies = [
"fluence-it-types 0.3.1 (git+https://github.com/fluencelabs/interface-types?branch=marine_web_experiments)",
"it-traits", "it-traits",
"log", "log",
"paste", "paste",
@ -1346,10 +1373,18 @@ dependencies = [
[[package]] [[package]]
name = "it-to-bytes" name = "it-to-bytes"
version = "0.1.0" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "729c74bb4236418898a219c6d96f14cba77456dd7c04a2e99e65e9c643709b56"
[[package]]
name = "it-to-bytes"
version = "0.1.0"
source = "git+https://github.com/fluencelabs/interface-types?branch=marine_web_experiments#2e742a9fe1c857f622c4f0d3e105dec548bc53cd"
[[package]] [[package]]
name = "it-traits" name = "it-traits"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/fluencelabs/interface-types?branch=marine_web_experiments#2e742a9fe1c857f622c4f0d3e105dec548bc53cd"
dependencies = [ dependencies = [
"thiserror", "thiserror",
] ]
@ -1502,7 +1537,7 @@ name = "marine-it-generator"
version = "0.5.6" version = "0.5.6"
dependencies = [ dependencies = [
"cargo_toml", "cargo_toml",
"it-lilo", "it-lilo 0.2.0",
"marine-it-parser 0.6.8", "marine-it-parser 0.6.8",
"marine-macro-impl", "marine-macro-impl",
"once_cell", "once_cell",
@ -1510,7 +1545,7 @@ dependencies = [
"serde_json", "serde_json",
"thiserror", "thiserror",
"walrus", "walrus",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.21.0",
] ]
[[package]] [[package]]
@ -1520,7 +1555,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "890b228b9151e9dff213501986f564445a2f9ca5a706088b5d900f5ecf67f7e7" checksum = "890b228b9151e9dff213501986f564445a2f9ca5a706088b5d900f5ecf67f7e7"
dependencies = [ dependencies = [
"cargo_toml", "cargo_toml",
"it-lilo", "it-lilo 0.1.0",
"marine-it-parser 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", "marine-it-parser 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-macro-impl", "marine-macro-impl",
"once_cell", "once_cell",
@ -1528,7 +1563,7 @@ dependencies = [
"serde_json", "serde_json",
"thiserror", "thiserror",
"walrus", "walrus",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.20.2",
] ]
[[package]] [[package]]
@ -1536,7 +1571,7 @@ name = "marine-it-interfaces"
version = "0.4.1" version = "0.4.1"
dependencies = [ dependencies = [
"multimap", "multimap",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.21.0",
] ]
[[package]] [[package]]
@ -1546,7 +1581,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42e229143e72ba20e754de4766ff0d02e0cf176001f7471593f82b16c72dc26d" checksum = "42e229143e72ba20e754de4766ff0d02e0cf176001f7471593f82b16c72dc26d"
dependencies = [ dependencies = [
"multimap", "multimap",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.20.2",
] ]
[[package]] [[package]]
@ -1562,7 +1597,7 @@ dependencies = [
"serde", "serde",
"thiserror", "thiserror",
"walrus", "walrus",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.21.0",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
] ]
@ -1581,7 +1616,7 @@ dependencies = [
"serde", "serde",
"thiserror", "thiserror",
"walrus", "walrus",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.20.2",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
] ]
@ -1651,7 +1686,7 @@ dependencies = [
"serde", "serde",
"thiserror", "thiserror",
"walrus", "walrus",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.21.0",
] ]
[[package]] [[package]]
@ -1668,7 +1703,7 @@ dependencies = [
"serde", "serde",
"thiserror", "thiserror",
"walrus", "walrus",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.20.2",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
] ]
@ -1717,7 +1752,7 @@ checksum = "983262d394c59d4321b141e303eb55015bc412f319d54bbad7f253e4583253b2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"boolinator", "boolinator",
"it-lilo", "it-lilo 0.1.0",
"log", "log",
"marine-it-generator 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "marine-it-generator 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-it-interfaces 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "marine-it-interfaces 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1733,7 +1768,7 @@ dependencies = [
"semver 0.11.0", "semver 0.11.0",
"serde", "serde",
"thiserror", "thiserror",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.20.2",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
"wasmer-runtime-fl", "wasmer-runtime-fl",
"wasmer-wasi-fl", "wasmer-wasi-fl",
@ -1746,7 +1781,7 @@ dependencies = [
"anyhow", "anyhow",
"boolinator", "boolinator",
"bytes 0.5.6", "bytes 0.5.6",
"it-lilo", "it-lilo 0.2.0",
"it-traits", "it-traits",
"log", "log",
"marine-it-generator 0.5.6", "marine-it-generator 0.5.6",
@ -1765,7 +1800,7 @@ dependencies = [
"serde", "serde",
"thiserror", "thiserror",
"tokio 0.2.25", "tokio 0.2.25",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.21.0",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
"wasmer-runtime-fl", "wasmer-runtime-fl",
"wasmer-wasi-fl", "wasmer-wasi-fl",
@ -1839,8 +1874,8 @@ dependencies = [
"boolinator", "boolinator",
"bytesize", "bytesize",
"console_error_panic_hook", "console_error_panic_hook",
"fluence-it-types", "fluence-it-types 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"it-lilo", "it-lilo 0.2.0",
"it-traits", "it-traits",
"itertools 0.10.3", "itertools 0.10.3",
"log", "log",
@ -1860,7 +1895,7 @@ dependencies = [
"thiserror", "thiserror",
"toml", "toml",
"wasm-bindgen", "wasm-bindgen",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.21.0",
] ]
[[package]] [[package]]
@ -2701,9 +2736,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]] [[package]]
name = "security-framework" name = "security-framework"
version = "2.4.2" version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" checksum = "d09d3c15d814eda1d6a836f2f2b56a6abc1446c8a34351cb3180d3db92ffe4ce"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"core-foundation", "core-foundation",
@ -2714,9 +2749,9 @@ dependencies = [
[[package]] [[package]]
name = "security-framework-sys" name = "security-framework-sys"
version = "2.4.2" version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" checksum = "e90dd10c41c6bfc633da6e0c659bd25d31e0791e5974ac42970267d59eba87f7"
dependencies = [ dependencies = [
"core-foundation-sys", "core-foundation-sys",
"libc", "libc",
@ -2805,9 +2840,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.74" version = "1.0.75"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" checksum = "c059c05b48c5c0067d4b4b2b4f0732dd65feb52daf7e0ea09cd87e7dadc1af79"
dependencies = [ dependencies = [
"itoa 1.0.1", "itoa 1.0.1",
"ryu", "ryu",
@ -2816,12 +2851,12 @@ dependencies = [
[[package]] [[package]]
name = "serde_urlencoded" name = "serde_urlencoded"
version = "0.7.0" version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [ dependencies = [
"form_urlencoded", "form_urlencoded",
"itoa 0.4.8", "itoa 1.0.1",
"ryu", "ryu",
"serde", "serde",
] ]
@ -3614,10 +3649,31 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-interface-types-fl" name = "wasmer-interface-types-fl"
version = "0.20.2" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14ba3b5a07989987994b96bf5cc7ac2947005f9ff6123d71b7064232f07d28fa"
dependencies = [ dependencies = [
"fluence-it-types", "fluence-it-types 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"it-lilo", "it-lilo 0.1.0",
"it-to-bytes", "it-to-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools 0.10.3",
"log",
"nom",
"safe-transmute",
"semver 0.11.0",
"serde",
"serde_json",
"thiserror",
"wast",
]
[[package]]
name = "wasmer-interface-types-fl"
version = "0.21.0"
source = "git+https://github.com/fluencelabs/interface-types?branch=marine_web_experiments#2e742a9fe1c857f622c4f0d3e105dec548bc53cd"
dependencies = [
"fluence-it-types 0.3.1 (git+https://github.com/fluencelabs/interface-types?branch=marine_web_experiments)",
"it-lilo 0.2.0",
"it-to-bytes 0.1.0 (git+https://github.com/fluencelabs/interface-types?branch=marine_web_experiments)",
"it-traits", "it-traits",
"itertools 0.10.3", "itertools 0.10.3",
"log", "log",

5
Cargo.toml
View File

@ -32,9 +32,8 @@ members = [
"tools/repl", "tools/repl",
] ]
[patch.crates-io] [patch.crates-io]
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.1", git = "https://github.com/fluencelabs/interface-types", branch = "marine_web_experiments"} wasmer-it = { package = "wasmer-interface-types-fl", version = "0.21.0", git = "https://github.com/fluencelabs/interface-types", branch = "marine_web_experiments"
fluence-it-types = { package = "fluence-it-types", git = "https://github.com/fluencelabs/interface-types", branch = "marine_web_experiments", features = ["impls"] } it-lilo = {package = "it-lilo", version = "0.2.0", git = "https://github.com/fluencelabs/interface-types", branch = "marine_web_experiments"}
it-lilo = {package = "it-lilo", git = "https://github.com/fluencelabs/interface-types", branch = "marine_web_experiments"}
[profile.release] [profile.release]
opt-level = 3 opt-level = 3

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

@ -14,8 +14,8 @@ path = "src/lib.rs"
marine-it-parser = { path = "../it-parser", version = "0.6.8"} marine-it-parser = { path = "../it-parser", version = "0.6.8"}
marine-macro-impl = "0.6.10" marine-macro-impl = "0.6.10"
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.2" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.21.0" }
it-lilo = "0.1.0" it-lilo = "0.2.0"
thiserror = "1.0.24" thiserror = "1.0.24"
walrus = "0.18.0" walrus = "0.18.0"

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

@ -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.1" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.21.0" }
multimap = "0.8.1" multimap = "0.8.1"

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

@ -17,7 +17,7 @@ marine-module-interface = { path = "../module-interface", version = "0.1.6" }
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.1"} wasmer-it = { package = "wasmer-interface-types-fl", version = "0.21.0"}
nom = "5.1" nom = "5.1"
itertools = "0.10.0" itertools = "0.10.0"

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

@ -16,7 +16,7 @@ marine-it-interfaces = { path = "../it-interfaces", version = "0.4.1" }
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.1"} wasmer-it = { package = "wasmer-interface-types-fl", version = "0.21.0"}
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.2" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.21.0" }
toml = "0.5.6" toml = "0.5.6"
serde = { version = "1.0.118", features = ["derive"] } serde = { version = "1.0.118", features = ["derive"] }

4
runtime/Cargo.toml
View File

@ -21,8 +21,8 @@ marine-utils = { path = "../crates/utils", version = "0.4.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.2" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.21.0" }
it-lilo = "0.1.0" it-lilo = "0.2.0"
it-traits = {package = "it-traits", git = "https://github.com/fluencelabs/interface-types", branch = "marine_web_experiments"} it-traits = {package = "it-traits", git = "https://github.com/fluencelabs/interface-types", branch = "marine_web_experiments"}
wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" } wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" }

4
web-runtime/Cargo.toml
View File

@ -27,9 +27,9 @@ marine-rs-sdk = "0.6.15"
#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.2" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.21.0" }
fluence-it-types = {version = "0.3.1", features = ["impls"] } fluence-it-types = {version = "0.3.1", features = ["impls"] }
it-lilo = "0.1.0" it-lilo = "0.2.0"
#it-traits = { path = "../../interface-types/crates/it-traits" } #it-traits = { path = "../../interface-types/crates/it-traits" }
it-traits = { git = "https://github.com/fluencelabs/interface-types/", package = "it-traits", branch = "marine_web_experiments"} it-traits = { git = "https://github.com/fluencelabs/interface-types/", package = "it-traits", branch = "marine_web_experiments"}
itertools = "0.10.1" itertools = "0.10.1"