[chapter 04] addressing second peer review

Signed-off-by: danbugs <danilochiarlone@gmail.com>

Author: danbugs

Cargo.lock

@@ -11,7 +11,7 @@ cargo build --target wasm32-unknown-unknown --release
 
 ```bash
 # from the `hello_world_guest/` directory
-docker run --rm -v "$(pwd):/data" danstaken/hello_world_host:latest  /data/hello_world_guest.wasm 'Dan'
+docker run --rm -v "$(pwd):/data" ghcr.io/danbugs/serverside-wasm-book-code/hello-world-host:latest  /data/hello_world_guest.wasm 'Dan' 
 ```
 
 You can also run locally, with:
@@ -24,5 +24,5 @@ cargo run -- ../hello_world_guest/hello_world_guest.wasm 'Dan'
 ## Toolchain versions
 
 ```bash
-rustc 1.85.0 (4d91de4e4 2025-02-17)
+rustc 1.84.0 (9fc6b4312 2025-01-07)
 ```

chapter02/hello_world/README.md

@@ -3,7 +3,7 @@
 ## How to compose two Wasm components together?
 
 ```bash
-wac plug <path-to>/composability_bin.wasm --plug <path-to>/composability_lib.wasm -o composability.wasm
+wac plug ../composability_bin.wasm --plug <path-to>/composability_lib.wasm -o composability.wasm
 ```
 
 ## How to run?

chapter02/hello_world/hello_world_guest/hello_world_guest.wasm

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-wit-bindgen-rt = { version = "0.28.0", features = ["bitflags"] }
+wit-bindgen-rt = { version = "0.41.0", features = ["bitflags"] }
 
 [profile.release]
 codegen-units = 1
@@ -16,8 +16,8 @@ lto = true
 [package.metadata.component]
 package = "composability:bin"
 
+[package.metadata.component.dependencies]
+
 [package.metadata.component.target]
 path = "../wit/bin.wit"
-world = "bin"
-
-[package.metadata.component.dependencies]
+world = "bin"

chapter04/composability/README.md

@@ -0,0 +1,23 @@
+# `hello_world_wasi02`
+
+## How to re-create this example?
+
+```bash
+cargo component new --bin hello_world_wasi02
+```
+
+## How to run?
+
+```bash
+wasmtime ../../target/wasm32-wasip1/release/hello_world_wasi02.wasm
+Hello, world!
+```
+
+## Toolchain Versions
+
+```bash
+cargo-component-component 0.14.0 (wasi:95fee6f)
+wasm-tools 1.227.1
+wasmtime 30.0.0
+```
+

chapter04/composability/composability.wasm

@@ -1,3 +1,5 @@
+// Generated by `wit-bindgen` 0.25.0. DO NOT EDIT!
+// Options used:
 #[allow(unused_unsafe, clippy::all)]
 pub fn hello_world() -> _rt::String {
     unsafe {
@@ -11,6 +13,7 @@ pub fn hello_world() -> _rt::String {
             #[link_name = "hello-world"]
             fn wit_import(_: *mut u8);
         }
+
         #[cfg(not(target_arch = "wasm32"))]
         fn wit_import(_: *mut u8) {
             unreachable!()
@@ -35,16 +38,19 @@ mod _rt {
     }
     extern crate alloc as alloc_crate;
 }
+
 #[cfg(target_arch = "wasm32")]
-#[link_section = "component-type:wit-bindgen:0.30.0:bin:encoded world"]
+#[link_section = "component-type:wit-bindgen:0.25.0:bin:encoded world"]
 #[doc(hidden)]
 pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 174] = *b"\
 \0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x075\x01A\x02\x01A\x02\x01\
 @\0\0s\x03\0\x0bhello-world\x01\0\x04\x01\x15composability:bin/bin\x04\0\x0b\x09\
 \x01\0\x03bin\x03\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0dwit-component\x07\
-0.215.0\x10wit-bindgen-rust\x060.30.0";
+0.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();
 }

chapter04/composability/composability_bin/Cargo.toml

@@ -5,4 +5,4 @@ use bindings::hello_world;
 
 fn main() {
     println!("{}", hello_world());
-}
+}

chapter04/composability/composability_bin/README.md

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-wit-bindgen-rt = { version = "0.28.0", features = ["bitflags"] }
+wit-bindgen-rt = { version = "0.41.0", features = ["bitflags"] }
 
 [lib]
 crate-type = ["cdylib"]
@@ -19,8 +19,8 @@ lto = true
 [package.metadata.component]
 package = "composability:lib"
 
+[package.metadata.component.dependencies]
+
 [package.metadata.component.target]
 path = "../wit/lib.wit"
 world = "lib"
-
-[package.metadata.component.dependencies]