Update Rust composition example

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

examples/rust/Cargo.lock

@@ -6,14 +6,9 @@ edition = "2021"
 [lib]
 crate-type = ["cdylib"]
 
-[package.metadata.component]
-package = "component:spin-fileserver-example"
-adapter = "../../adapters/fd1e948d/wasi_snapshot_preview1.reactor.wasm"
-
 [dependencies]
-cargo-component-bindings = "0.4.0"
-wit-bindgen = "0.13.0"
-spin-sdk = { git = "https://github.com/fermyon/spin" }
-futures = "0.3.28"
+wit-bindgen = "0.16.0"
+spin-sdk = "3.0.1"
+futures = "0.3.30"
 
 [workspace]

examples/rust/Cargo.toml

@@ -11,17 +11,15 @@ component for serving static files.
 - [Spin v2.0+](https://developer.fermyon.com/spin/install)
 - [Rust](https://rustup.rs/), including the `wasm32-wasi` target
 - [cargo-component](https://github.com/bytecodealliance/cargo-component)
-- [wasm-tools](https://github.com/bytecodealliance/wasm-tools/)
-  - Note that you'll need [this fork](https://github.com/dicej/wasm-tools/tree/wasm-compose-resource-imports) until [this PR](https://github.com/bytecodealliance/wasm-tools/pull/1261) has been merged and released.
+- [wac](https://github.com/bytecodealliance/wac)
 - [curl](https://curl.se/download.html) or a web browser for testing
 
 Once you have Rust installed, the following should give you everything else:
 
 ```shell
 rustup target add wasm32-wasi
 cargo install cargo-component
-cargo install --locked --git https://github.com/dicej/wasm-tools \
-    --branch wasm-compose-resource-imports wasm-tools
+cargo install wac-cli
 ```
 
 ## Building and Running

examples/rust/README.md

@@ -14,5 +14,5 @@ component = "spin-fileserver-example"
 source = "target/wasm32-wasi/release/composed.wasm"
 files = [{ source = "../static", destination = "/" }]
 [component.spin-fileserver-example.build]
-command = "cargo component build --release && (cd .. && cargo component build --release) && RUST_LOG=error wasm-tools compose target/wasm32-wasi/release/spin_fileserver_example.wasm -c compose.yml -o target/wasm32-wasi/release/composed.wasm"
+command = "cargo component build --release && (cd .. && cargo component build --release) && RUST_LOG=error wac plug --plug ../../target/wasm32-wasi/release/spin_static_fs.wasm  target/wasm32-wasi/release/spin_fileserver_example.wasm -o target/wasm32-wasi/release/composed.wasm"
 watch = ["src/**/*.rs", "Cargo.toml"]

examples/rust/compose.yml

@@ -0,0 +1,18 @@
+// Generated by `wit-bindgen` 0.25.0. DO NOT EDIT!
+// Options used:
+
+#[cfg(target_arch = "wasm32")]
+#[link_section = "component-type:wit-bindgen:0.25.0:spin-fileserver-example:encoded world"]
+#[doc(hidden)]
+pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 209] = *b"\
+\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07D\x01A\x02\x01A\0\x04\
+\x019component:spin-fileserver-example/spin-fileserver-example\x04\0\x0b\x1d\x01\
+\0\x17spin-fileserver-example\x03\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0d\
+wit-component\x070.208.1\x10wit-bindgen-rust\x060.25.0";
+
+#[inline(never)]
+#[doc(hidden)]
+#[cfg(target_arch = "wasm32")]
+pub fn __link_custom_section_describing_imports() {
+    wit_bindgen_rt::maybe_link_cabi_realloc();
+}

examples/rust/spin.toml

@@ -1,5 +1,5 @@
 use {
-    bindings::wasi::http::incoming_handler,
+    bindings::wasi::http0_2_0::incoming_handler,
     futures::SinkExt,
     spin_sdk::{
         http::{Fields, IncomingRequest, Method, OutgoingResponse, ResponseOutparam},
@@ -12,9 +12,7 @@ mod bindings {
         path: "../wit",
         world: "delegate",
         with: {
-            "wasi:http/[email protected]": spin_sdk::wit::wasi::http::types,
-            "wasi:io/[email protected]": spin_sdk::wit::wasi::io::streams,
-            "wasi:io/[email protected]": spin_sdk::wit::wasi::io,
+            "wasi:http/[email protected]": ::spin_sdk::wit::wasi::http::types,
         }
     });
 }
@@ -23,10 +21,11 @@ mod bindings {
 async fn handle_request(request: IncomingRequest, response_out: ResponseOutparam) {
     match (request.method(), request.path_with_query().as_deref()) {
         (Method::Get, Some("/hello")) => {
-            let response = OutgoingResponse::new(
-                200,
-                &Fields::new(&[("content-type".to_string(), b"text/plain".to_vec())]),
-            );
+            let fields = Fields::new();
+            fields
+                .append(&"content-type".to_owned(), &b"text/plain".to_vec())
+                .unwrap();
+            let response = OutgoingResponse::new(fields);
 
             let mut body = response.take_body();
 
@@ -43,7 +42,9 @@ async fn handle_request(request: IncomingRequest, response_out: ResponseOutparam
         }
 
         _ => {
-            response_out.set(OutgoingResponse::new(405, &Fields::new(&[])));
+            let response = OutgoingResponse::new(Fields::new());
+            response.set_status_code(405).unwrap();
+            response_out.set(response);
         }
     }
 }

examples/rust/src/bindings.rs

@@ -1,37 +1,35 @@
 // All of the same imports and exports available in the wasi:cli/command world
 // with addition of HTTP proxy related imports:
 world command-extended {
-  import wasi:clocks/wall-clock@0.2.0-rc-2023-10-18;
-  import wasi:clocks/monotonic-clock@0.2.0-rc-2023-10-18;
-  import wasi:clocks/timezone@0.2.0-rc-2023-10-18;
-  import wasi:filesystem/types@0.2.0-rc-2023-10-18;
-  import wasi:filesystem/preopens@0.2.0-rc-2023-10-18;
-  import wasi:sockets/instance-network@0.2.0-rc-2023-10-18;
-  import wasi:sockets/ip-name-lookup@0.2.0-rc-2023-10-18;
-  import wasi:sockets/network@0.2.0-rc-2023-10-18;
-  import wasi:sockets/tcp-create-socket@0.2.0-rc-2023-10-18;
-  import wasi:sockets/tcp@0.2.0-rc-2023-10-18;
-  import wasi:sockets/udp-create-socket@0.2.0-rc-2023-10-18;
-  import wasi:sockets/udp@0.2.0-rc-2023-10-18;
-  import wasi:random/random@0.2.0-rc-2023-10-18;
-  import wasi:random/insecure@0.2.0-rc-2023-10-18;
-  import wasi:random/insecure-seed@0.2.0-rc-2023-10-18;
-  import wasi:io/poll@0.2.0-rc-2023-10-18;
-  import wasi:io/streams@0.2.0-rc-2023-10-18;
-  import wasi:cli/environment@0.2.0-rc-2023-10-18;
-  import wasi:cli/exit@0.2.0-rc-2023-10-18;
-  import wasi:cli/stdin@0.2.0-rc-2023-10-18;
-  import wasi:cli/stdout@0.2.0-rc-2023-10-18;
-  import wasi:cli/stderr@0.2.0-rc-2023-10-18;
-  import wasi:cli/terminal-input@0.2.0-rc-2023-10-18;
-  import wasi:cli/terminal-output@0.2.0-rc-2023-10-18;
-  import wasi:cli/terminal-stdin@0.2.0-rc-2023-10-18;
-  import wasi:cli/terminal-stdout@0.2.0-rc-2023-10-18;
-  import wasi:cli/terminal-stderr@0.2.0-rc-2023-10-18;
+  import wasi:clocks/wall-clock@0.2.0;
+  import wasi:clocks/monotonic-clock@0.2.0;
+  import wasi:filesystem/types@0.2.0;
+  import wasi:filesystem/preopens@0.2.0;
+  import wasi:sockets/instance-network@0.2.0;
+  import wasi:sockets/ip-name-lookup@0.2.0;
+  import wasi:sockets/network@0.2.0;
+  import wasi:sockets/tcp-create-socket@0.2.0;
+  import wasi:sockets/tcp@0.2.0;
+  import wasi:sockets/udp-create-socket@0.2.0;
+  import wasi:sockets/udp@0.2.0;
+  import wasi:random/random@0.2.0;
+  import wasi:random/insecure@0.2.0;
+  import wasi:random/insecure-seed@0.2.0;
+  import wasi:io/poll@0.2.0;
+  import wasi:io/streams@0.2.0;
+  import wasi:cli/environment@0.2.0;
+  import wasi:cli/exit@0.2.0;
+  import wasi:cli/stdin@0.2.0;
+  import wasi:cli/stdout@0.2.0;
+  import wasi:cli/stderr@0.2.0;
+  import wasi:cli/terminal-input@0.2.0;
+  import wasi:cli/terminal-output@0.2.0;
+  import wasi:cli/terminal-stdin@0.2.0;
+  import wasi:cli/terminal-stdout@0.2.0;
+  import wasi:cli/terminal-stderr@0.2.0;
 
   // We should replace all others with `include self.command`
   // as soon as the unioning of worlds is available:
   // https://github.com/WebAssembly/component-model/issues/169
-  import wasi:logging/logging@0.2.0-rc-2023-10-18;
-  import wasi:http/outgoing-handler@0.2.0-rc-2023-10-18;
+  import wasi:http/outgoing-handler@0.2.0;
 }

examples/rust/src/lib.rs

@@ -1,3 +1,3 @@
 world delegate {
-  import wasi:http/incoming-handler@0.2.0-rc-2023-10-18;
+  import wasi:http/incoming-handler@0.2.0;
 }

examples/wit/command-extended.wit

@@ -0,0 +1,7 @@
+package wasi:cli@0.2.0-rc-2023-10-18;
+
+world command {
+  include reactor;
+
+  export run;
+}