Skip to content

chore: update Wasmtime to 40 #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
rvolosatovs wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore: update Wasmtime to 40 #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
801 changes: 387 additions & 414 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,14 @@ url = { version = "2.5", default-features = false }
uuid = { version = "1.17.0", default-features = false }
wasm-pkg-client = { version = "0.10.0", default-features = false }
wasm-pkg-core = { version = "0.10.0", default-features = false }
wasm-metadata = { version = "0.239.0", default-features = false, features = ["oci"] }
wasm-metadata = { version = "0.243", default-features = false, features = ["oci"] }
wasmcloud = { path = "crates/wasmcloud", default-features = false }
wasmtime = { version = "38", default-features = false }
wasmtime-wasi = { version = "38", default-features = false }
wasmtime-wasi-io = { version = "38", default-features = false }
wasmtime-wasi-http = { version = "38", default-features = false }
wasmtime = { version = "40", default-features = false }
wasmtime-wasi = { version = "40", default-features = false }
wasmtime-wasi-io = { version = "40", default-features = false }
wasmtime-wasi-http = { version = "40", default-features = false }
which = { version = "6.0.3", default-features = false }
wit-component = { version = "0.235.0", default-features = false }
wit-component = { version = "0.243", default-features = false }
wash-runtime = { path = "crates/wash-runtime", default-features = false }

[build-dependencies]
Expand All @@ -158,7 +158,7 @@ bytes = { version = "1", default-features = false }
http = { version = "1.3.1", default-features = false }
http-body-util = { version = "0.1.3", default-features = false }
rcgen = { version = "0.13", default-features = false, features = ["crypto", "ring", "pem"] }
wat = { version = "1.239.0", default-features = false }
wat = { version = "1.243", default-features = false }
scopeguard = { version = "1.2", default-features = false }
tempfile = { version = "3.0", default-features = false }
tokio = { version = "1.45.1", default-features = false, features = ["full"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/wash-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ opentelemetry-semantic-conventions = { workspace = true, features = [
"semconv_experimental",
] }
opentelemetry_sdk = { workspace = true }
wasi-graphics-context-wasmtime = { git = "https://github.com/wasi-gfx/wasi-gfx-runtime.git", rev = "fffd275ad1abb23817c720309570059d8304c61a", optional = true }
wasi-webgpu-wasmtime = { git = "https://github.com/wasi-gfx/wasi-gfx-runtime.git", rev = "fffd275ad1abb23817c720309570059d8304c61a", optional = true }
wasi-graphics-context-wasmtime = { git = "https://github.com/wasi-gfx/wasi-gfx-runtime.git", rev = "5f44f42c0438c2659ea1a9d18d724a13580a1a31", optional = true }
wasi-webgpu-wasmtime = { git = "https://github.com/wasi-gfx/wasi-gfx-runtime.git", rev = "5f44f42c0438c2659ea1a9d18d724a13580a1a31", optional = true }

# OCI dependencies (optional, behind 'oci' feature)
docker_credential = { workspace = true, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/wash-runtime/src/engine/workload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ impl ResolvedWorkload {
linker_instance
.func_new_async(
&export_name.clone(),
move |mut store, params, results| {
move |mut store, _ty, params, results| {
// TODO(#103): some kind of store data hashing mechanism
// to detect a diff store to drop the old one
let import_name = import_name.clone();
Expand Down
8 changes: 4 additions & 4 deletions crates/wash-runtime/src/plugin/wasi_blobstore.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ mod bindings {
imports: { default: async | trappable },
with: {
"wasi:io": ::wasmtime_wasi::p2::bindings::io,
"wasi:blobstore/container/container": String,
"wasi:blobstore/container/stream-object-names": crate::plugin::wasi_blobstore::StreamObjectNamesHandle,
"wasi:blobstore/types/incoming-value": crate::plugin::wasi_blobstore::IncomingValueHandle,
"wasi:blobstore/types/outgoing-value": crate::plugin::wasi_blobstore::OutgoingValueHandle,
"wasi:blobstore/container.container": String,
"wasi:blobstore/container.stream-object-names": crate::plugin::wasi_blobstore::StreamObjectNamesHandle,
"wasi:blobstore/types.incoming-value": crate::plugin::wasi_blobstore::IncomingValueHandle,
"wasi:blobstore/types.outgoing-value": crate::plugin::wasi_blobstore::OutgoingValueHandle,
},
});
}
Expand Down
2 changes: 1 addition & 1 deletion crates/wash-runtime/src/plugin/wasi_keyvalue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ mod bindings {
world: "keyvalue",
imports: { default: async | trappable },
with: {
"wasi:keyvalue/store/bucket": crate::plugin::wasi_keyvalue::BucketHandle,
"wasi:keyvalue/store.bucket": crate::plugin::wasi_keyvalue::BucketHandle,
},
});
}
Expand Down
8 changes: 4 additions & 4 deletions crates/wash-runtime/src/washlet/plugins/wasi_blobstore.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ mod bindings {
imports: { default: async | trappable },
with: {
"wasi:io": ::wasmtime_wasi::p2::bindings::io,
"wasi:blobstore/container/container": crate::washlet::plugins::wasi_blobstore::ContainerData,
"wasi:blobstore/container/stream-object-names": crate::washlet::plugins::wasi_blobstore::StreamObjectNamesHandle,
"wasi:blobstore/types/incoming-value": crate::washlet::plugins::wasi_blobstore::IncomingValueHandle,
"wasi:blobstore/types/outgoing-value": crate::washlet::plugins::wasi_blobstore::OutgoingValueHandle,
"wasi:blobstore/container.container": crate::washlet::plugins::wasi_blobstore::ContainerData,
"wasi:blobstore/container.stream-object-names": crate::washlet::plugins::wasi_blobstore::StreamObjectNamesHandle,
"wasi:blobstore/types.incoming-value": crate::washlet::plugins::wasi_blobstore::IncomingValueHandle,
"wasi:blobstore/types.outgoing-value": crate::washlet::plugins::wasi_blobstore::OutgoingValueHandle,
},
});
}
Expand Down
2 changes: 1 addition & 1 deletion crates/wash-runtime/src/washlet/plugins/wasi_keyvalue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ mod bindings {
world: "keyvalue",
imports: { default: async | trappable },
with: {
"wasi:keyvalue/store/bucket": crate::washlet::plugins::wasi_keyvalue::BucketHandle,
"wasi:keyvalue/store.bucket": crate::washlet::plugins::wasi_keyvalue::BucketHandle,
},
});
}
Expand Down
8 changes: 4 additions & 4 deletions crates/wash/src/plugin/bindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ wasmtime::component::bindgen!({
imports: { default: async },
exports: { default: async },
with: {
"wasmcloud:wash/types/runner": crate::plugin::runner::Runner,
"wasmcloud:wash/types/project-config": crate::plugin::runner::ProjectConfig,
"wasmcloud:wash/types/plugin-config": crate::plugin::runner::PluginConfig,
"wasmcloud:wash/types/context": crate::plugin::runner::Context,
"wasmcloud:wash/types.runner": crate::plugin::runner::Runner,
"wasmcloud:wash/types.project-config": crate::plugin::runner::ProjectConfig,
"wasmcloud:wash/types.plugin-config": crate::plugin::runner::PluginConfig,
"wasmcloud:wash/types.context": crate::plugin::runner::Context,
}
});

Expand Down
Loading