Skip to content

Commit

Permalink
Remove some unnecessary world versions (#7293)
Browse files Browse the repository at this point in the history
With updates to `wit-parser` and `wit-bindgen` some of these versions
are now optional and can be omitted.
  • Loading branch information
alexcrichton authored Oct 19, 2023
1 parent f111843 commit 8dfbc52
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion crates/test-programs/src/bin/api_proxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub mod bindings {

wit_bindgen::generate!({
path: "../wasi-http/wit",
world: "wasi:http/proxy@0.2.0-rc-2023-10-18",
world: "wasi:http/proxy",
exports: {
"wasi:http/incoming-handler": T,
},
Expand Down
4 changes: 2 additions & 2 deletions crates/wasi-http/src/proxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::{bindings, WasiHttpView};
use wasmtime_wasi::preview2;

wasmtime::component::bindgen!({
world: "wasi:http/proxy@0.2.0-rc-2023-10-18",
world: "wasi:http/proxy",
tracing: true,
async: true,
with: {
Expand Down Expand Up @@ -40,7 +40,7 @@ pub mod sync {
use wasmtime_wasi::preview2;

wasmtime::component::bindgen!({
world: "wasi:http/proxy@0.2.0-rc-2023-10-18",
world: "wasi:http/proxy",
tracing: true,
async: false,
with: {
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-preview1-component-adapter/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pub mod bindings {
#[cfg(feature = "command")]
wit_bindgen::generate!({
path: "../wasi/wit",
world: "wasi:cli/command@0.2.0-rc-2023-10-18",
world: "wasi:cli/command",
std_feature,
raw_strings,
// Automatically generated bindings for these functions will allocate
Expand Down
4 changes: 2 additions & 2 deletions crates/wasi/src/preview2/command.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::preview2::WasiView;

wasmtime::component::bindgen!({
world: "wasi:cli/command@0.2.0-rc-2023-10-18",
world: "wasi:cli/command",
tracing: true,
async: true,
with: {
Expand Down Expand Up @@ -60,7 +60,7 @@ pub mod sync {
use crate::preview2::WasiView;

wasmtime::component::bindgen!({
world: "wasi:cli/command@0.2.0-rc-2023-10-18",
world: "wasi:cli/command",
tracing: true,
async: false,
with: {
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi/src/preview2/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ pub mod bindings {

wasmtime::component::bindgen!({
path: "wit",
interfaces: "include wasi:cli/reactor@0.2.0-rc-2023-10-18;",
world: "wasi:cli/reactor",
tracing: true,
async: {
// Only these functions are `async` and everything else is sync
Expand Down

0 comments on commit 8dfbc52

Please sign in to comment.