Skip to content

Commit 114c6c4

Browse files
committed
implement resource support
This requires bytecodealliance/wasm-tools#1226 and an updated Wasmtime to pull in bytecodealliance/wasm-tools#1218, which means pointing to bleeding-edge git dependencies for the time being.
1 parent 67aa9be commit 114c6c4

File tree

22 files changed

+3059
-575
lines changed

22 files changed

+3059
-575
lines changed

Cargo.lock

Lines changed: 201 additions & 127 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ zstd = "0.11.1"
1717
componentize-py-shared = { path = "shared" }
1818
wasmparser = "0.107.0"
1919
wasm-encoder = "0.29.0"
20-
wit-parser = "0.11.0"
21-
wit-component = "0.14.0"
20+
# TODO: switch to release once https://github.com/bytecodealliance/wasm-tools/pull/1226 is merged and released:
21+
wit-parser = { git = "https://github.com/dicej/wasm-tools", branch = "adapter-export-resources" }
22+
wit-component = { git = "https://github.com/dicej/wasm-tools", branch = "adapter-export-resources" }
2223
indexmap = "2.0.0"
2324
bincode = "1.3.3"
2425
heck = "0.4.1"
2526
pyo3 = { version = "0.18.3", features = ["abi3-py37", "extension-module"], optional = true }
26-
wasmtime-wasi = { git = "https://github.com/bytecodealliance/wasmtime", rev = "2ad057d735edc43f8ba89428d483f2b2430c1068" }
27-
wasi-common = { git = "https://github.com/bytecodealliance/wasmtime", rev = "2ad057d735edc43f8ba89428d483f2b2430c1068" }
28-
wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "2ad057d735edc43f8ba89428d483f2b2430c1068", features = [
29-
"component-model",
30-
] }
27+
# TODO: switch to Wasmtime 14 when released:
28+
wasmtime-wasi = { git = "https://github.com/bytecodealliance/wasmtime", rev = "40c1f9b8b4f962ed763e47943e6ce0a3be8d1966" }
29+
wasi-common = { git = "https://github.com/bytecodealliance/wasmtime", rev = "40c1f9b8b4f962ed763e47943e6ce0a3be8d1966" }
30+
wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "40c1f9b8b4f962ed763e47943e6ce0a3be8d1966", features = [ "component-model" ] }
3131
once_cell = "1.17.1"
3232
component-init = { git = "https://github.com/dicej/component-init" }
3333
async-trait = "0.1.68"
@@ -36,6 +36,7 @@ tokio = { version = "1.27.0", features = ["macros", "rt", "rt-multi-thread", "fs
3636
bytes = "1.4.0"
3737
pretty_env_logger = "0.5.0"
3838
cap-std = "2.0.0"
39+
im-rc = "15.1.0"
3940

4041
[dev-dependencies]
4142
async-trait = "0.1.68"
-99.6 KB
Binary file not shown.
100 KB
Binary file not shown.

build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ fn package_all_the_things(out_dir: &Path) -> Result<()> {
185185
bail!("no such directory: {}", path.display())
186186
}
187187
compress(
188-
&repo_dir.join("adapters/2ad057d"),
188+
&repo_dir.join("adapters/40c1f9b8"),
189189
"wasi_snapshot_preview1.reactor.wasm",
190190
out_dir,
191191
false,

runtime/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ once_cell = "1.17.1"
1212
pyo3 = { version = "0.18.3", features = ["abi3-py311", "num-bigint"] }
1313
componentize-py-shared = { path = "../shared" }
1414
num-bigint = "0.4.3"
15-
wit-bindgen = "0.7.0"
15+
wit-bindgen = "0.12.0"

0 commit comments

Comments
 (0)