Merge pull request #2948 from vdice/ref/wasm32-wasip1-updates

ref(*): replace wasm32-wasi with wasm32-wasip1

Author: vdice

.devcontainer/bootstrap.sh

@@ -2,4 +2,4 @@
 rustup update stable && rustup default stable && rustup component add clippy rustfmt
 
 # Installs wasm32 compiler targets
-rustup target add wasm32-wasi wasm32-unknown-unknown
+rustup target add wasm32-wasip1 wasm32-unknown-unknown

.github/actions/spin-ci-dependencies/action.yml

@@ -95,7 +95,7 @@ runs:
         rustup default ${{ inputs.rust-version }}
 
     - name: "Install Wasm Rust target"
-      run: rustup target add wasm32-wasi wasm32-wasip1 wasm32-unknown-unknown
+      run: rustup target add wasm32-wasip1 wasm32-unknown-unknown
       if: ${{ inputs.rust-wasm == 'true' }}
       shell: bash
 

.github/workflows/build.yml

@@ -196,7 +196,7 @@ jobs:
 
       # Install all the toolchain dependencies
       - name: Install Rust wasm target
-        run: rustup target add wasm32-wasi wasm32-wasip1 wasm32-unknown-unknown
+        run: rustup target add wasm32-wasip1 wasm32-unknown-unknown
       - uses: goto-bus-stop/setup-zig@v2
       - uses: actions/setup-go@v4
         with:
@@ -281,7 +281,7 @@ jobs:
         run: rustup target add --toolchain ${{ env.RUST_VERSION }} ${{ matrix.config.target }}
 
       - name: "Install Wasm Rust target"
-        run: rustup target add wasm32-wasi wasm32-wasip1 wasm32-unknown-unknown --toolchain ${{ env.RUST_VERSION }}
+        run: rustup target add wasm32-wasip1 wasm32-unknown-unknown --toolchain ${{ env.RUST_VERSION }}
 
       - name: setup for cross-compiled linux aarch64 build
         if: matrix.config.target == 'aarch64-unknown-linux-gnu'

.github/workflows/release.yml

@@ -103,7 +103,7 @@ jobs:
         run: rustup target add --toolchain ${{ env.RUST_VERSION }} ${{ matrix.config.target }}
 
       - name: "Install Wasm Rust target"
-        run: rustup target add wasm32-wasi wasm32-wasip1 wasm32-unknown-unknown --toolchain ${{ env.RUST_VERSION }}
+        run: rustup target add wasm32-wasip1 wasm32-unknown-unknown --toolchain ${{ env.RUST_VERSION }}
 
       - name: setup for cross-compiled linux aarch64 build
         if: matrix.config.target == 'aarch64-unknown-linux-gnu'

README.md

@@ -39,10 +39,10 @@ and then follow the
 language guides, and the [guide on writing Spin applications](https://developer.fermyon.com/spin/configuration/).
 
 ## Usage
-Below is an example of using the `spin` CLI to create a new Spin application.  To run the example you will need to install the `wasm32-wasi` target for Rust.
+Below is an example of using the `spin` CLI to create a new Spin application.  To run the example you will need to install the `wasm32-wasip1` target for Rust.
 
 ```bash
-$ rustup target add wasm32-wasi
+$ rustup target add wasm32-wasip1
 ```
 
 First, run the `spin new` command to create a Spin application from a template.
@@ -55,7 +55,7 @@ Running the `spin new` command created a `hello-rust` directory with all the nec
 ```bash
 # Compile to Wasm by executing the `build` command.
 $ spin build
-Executing the build command for component hello-rust: cargo build --target wasm32-wasi --release
+Executing the build command for component hello-rust: cargo build --target wasm32-wasip1 --release
     Finished release [optimized] target(s) in 0.03s
 Successfully ran the build command for the Spin components.
 

build.rs

@@ -58,8 +58,8 @@ fn main() {
 
         println!(
             r#"
-error: the `wasm32-wasi` target is not installed
-    = help: consider downloading the target with `rustup{} target add wasm32-wasi`"#,
+error: the `wasm32-wasip1` target is not installed
+    = help: consider downloading the target with `rustup{} target add wasm32-wasip1`"#,
             toolchain_override
         );
         process::exit(1);
@@ -75,7 +75,7 @@ error: the `wasm32-wasi` target is not installed
 fn build_wasm_test_program(name: &'static str, root: &'static str) {
     build_target_dep(root, Path::new("target/test-programs").join(name))
         .release()
-        .target("wasm32-wasi")
+        .target("wasm32-wasip1")
         .build();
     println!("cargo:rerun-if-changed={root}/Cargo.toml");
     println!("cargo:rerun-if-changed={root}/Cargo.lock");
@@ -85,7 +85,7 @@ fn build_wasm_test_program(name: &'static str, root: &'static str) {
 fn has_wasm32_wasi_target() -> bool {
     // Using rustc here for systems that don't have rustup
     let output = run(
-        vec!["rustc", "--print=target-libdir", "--target=wasm32-wasi"],
+        vec!["rustc", "--print=target-libdir", "--target=wasm32-wasip1"],
         None,
         None,
     );
@@ -110,7 +110,7 @@ fn cargo_build(dir: &str) {
             "cargo",
             "build",
             "--target",
-            "wasm32-wasi",
+            "wasm32-wasip1",
             "--release",
             // Ensure that even if `CARGO_TARGET_DIR` is set
             // that we're still building into the right dir.

crates/componentize/README.md

@@ -12,7 +12,7 @@ the original module exported.
 This crate requires a [Rust](https://rustup.rs/) installation v1.68 or later and a couple of Wasm targets:
 
 ```shell
-rustup target add wasm32-wasi
+rustup target add wasm32-wasip1
 rustup target add wasm32-unknown-unknown
 ```
 

crates/componentize/src/lib.rs

@@ -413,7 +413,7 @@ mod tests {
         run_spin(
             &fs::read(concat!(
                 env!("OUT_DIR"),
-                "/wasm32-wasi/release/rust_case_02.wasm"
+                "/wasm32-wasip1/release/rust_case_02.wasm"
             ))
             .await?,
         )
@@ -426,7 +426,7 @@ mod tests {
         run_spin(
             &fs::read(concat!(
                 env!("OUT_DIR"),
-                "/wasm32-wasi/release/rust_case_08.wasm"
+                "/wasm32-wasip1/release/rust_case_08.wasm"
             ))
             .await?,
         )
@@ -458,7 +458,7 @@ mod tests {
         run_command(
             &fs::read(concat!(
                 env!("OUT_DIR"),
-                "/wasm32-wasi/release/rust-command.wasm"
+                "/wasm32-wasip1/release/rust-command.wasm"
             ))
             .await?,
         )
@@ -471,7 +471,7 @@ mod tests {
         cmd.arg("build")
             .current_dir(format!("tests/{name}"))
             .arg("--release")
-            .arg("--target=wasm32-wasi")
+            .arg("--target=wasm32-wasip1")
             .env("CARGO_TARGET_DIR", out_dir);
 
         let status = cmd.status().unwrap();

crates/componentize/tests/rust-case-0.2/Makefile

@@ -1,5 +1,5 @@
-spin-abi-conformance.wasm: target/wasm32-wasi/release/spin-rust.wasm
+spin-abi-conformance.wasm: target/wasm32-wasip1/release/spin-rust.wasm
 	cp $< $@
 
-target/wasm32-wasi/release/spin-rust.wasm: src/main.rs Cargo.toml
-	cargo build --target wasm32-wasi --release
+target/wasm32-wasip1/release/spin-rust.wasm: src/main.rs Cargo.toml
+	cargo build --target wasm32-wasip1 --release

crates/core/tests/core-wasi-test/.cargo/config.toml

@@ -1,2 +1,2 @@
 [build]
-target = "wasm32-wasi"
+target = "wasm32-wasip1"