Rename "preview{0,1}" in wasmtime-wasi to "p{0,1}" (#11380)

* Rename "preview{0,1}" in `wasmtime-wasi` to "p{0,1}"

This commit renames the `preview1` module and features to `p1` and does
the same for `preview0`. This additionally cleans up the test suite a
bit to share more code amongst all the implementaitons and to also move
the p1 tests out of the p2 folder.

This additionally adds a `p2` feature to the `wasmtime-wasi` crate but
it does not currently gate the `p2` module because that'll require some
more refactoring an annotations to get that working.

* Fix build of the CLI

* Fix build of the C API

* Fix bench-api build

* Fix build of examples

* More renamings

Author: alexcrichton

.github/workflows/main.yml

@@ -398,6 +398,14 @@ jobs:
           - name: wasmtime-wasi-http
             checks: |
               -p wasmtime-wasi-http --no-default-features
+
+          - name: wasmtime-wasi
+            checks: |
+              -p wasmtime-wasi --no-default-features
+              -p wasmtime-wasi --no-default-features --features p0
+              -p wasmtime-wasi --no-default-features --features p1
+              -p wasmtime-wasi --no-default-features --features p2
+              -p wasmtime-wasi --no-default-features --features p3
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4

benches/instantiation.rs

@@ -7,7 +7,7 @@ use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering::SeqCst};
 use std::thread;
 use wasmtime::*;
-use wasmtime_wasi::{WasiCtx, preview1::WasiP1Ctx};
+use wasmtime_wasi::{WasiCtx, p1::WasiP1Ctx};
 
 fn store(engine: &Engine) -> Store<WasiP1Ctx> {
     let wasi = WasiCtx::builder().build_p1();
@@ -49,7 +49,7 @@ fn bench_sequential(c: &mut Criterion, path: &Path) {
             // benchmark programs.
             linker.func_wrap("bench", "start", || {}).unwrap();
             linker.func_wrap("bench", "end", || {}).unwrap();
-            wasmtime_wasi::preview1::add_to_linker_sync(&mut linker, |cx| cx).unwrap();
+            wasmtime_wasi::p1::add_to_linker_sync(&mut linker, |cx| cx).unwrap();
             let pre = linker
                 .instantiate_pre(&module)
                 .expect("failed to pre-instantiate");
@@ -83,7 +83,7 @@ fn bench_parallel(c: &mut Criterion, path: &Path) {
             // benchmark programs.
             linker.func_wrap("bench", "start", || {}).unwrap();
             linker.func_wrap("bench", "end", || {}).unwrap();
-            wasmtime_wasi::preview1::add_to_linker_sync(&mut linker, |cx| cx).unwrap();
+            wasmtime_wasi::p1::add_to_linker_sync(&mut linker, |cx| cx).unwrap();
             let pre = Arc::new(
                 linker
                     .instantiate_pre(&module)

benches/wasi.rs

@@ -3,7 +3,7 @@
 use criterion::{Criterion, criterion_group, criterion_main};
 use std::{fs::File, path::Path, time::Instant};
 use wasmtime::{Engine, Linker, Module, Store, TypedFunc};
-use wasmtime_wasi::{DirPerms, FilePerms, WasiCtx, preview1::WasiP1Ctx};
+use wasmtime_wasi::{DirPerms, FilePerms, WasiCtx, p1::WasiP1Ctx};
 
 criterion_group!(benches, bench_wasi);
 criterion_main!(benches);
@@ -53,7 +53,7 @@ fn instantiate(wat: &[u8]) -> (Store<WasiP1Ctx>, TypedFunc<u64, u64>) {
     let mut store = Store::new(&engine, wasi);
     let module = Module::new(&engine, wat).unwrap();
     let mut linker = Linker::new(&engine);
-    wasmtime_wasi::preview1::add_to_linker_sync(&mut linker, |cx| cx).unwrap();
+    wasmtime_wasi::p1::add_to_linker_sync(&mut linker, |cx| cx).unwrap();
     let instance = linker.instantiate(&mut store, &module).unwrap();
     let run = instance.get_typed_func(&mut store, "run").unwrap();
     (store, run)

crates/bench-api/Cargo.toml

@@ -26,7 +26,7 @@ wasmtime = { workspace = true, default-features = true, features = ["winch", "pu
 wasmtime-cli-flags = { workspace = true, default-features = true, features = [
     "cranelift",
 ] }
-wasmtime-wasi = { workspace = true, features = ['preview1'] }
+wasmtime-wasi = { workspace = true, features = ['p1'] }
 wasmtime-wasi-nn = { workspace = true, optional = true }
 cap-std = { workspace = true }
 clap = { workspace = true }

crates/bench-api/src/lib.rs

@@ -144,7 +144,7 @@ use std::{env, path::PathBuf};
 use wasmtime::{Engine, Instance, Linker, Module, Store};
 use wasmtime_cli_flags::CommonOptions;
 use wasmtime_wasi::cli::{InputFile, OutputFile};
-use wasmtime_wasi::{DirPerms, FilePerms, I32Exit, WasiCtx, preview1::WasiP1Ctx};
+use wasmtime_wasi::{DirPerms, FilePerms, I32Exit, WasiCtx, p1::WasiP1Ctx};
 
 pub type ExitCode = c_int;
 pub const OK: ExitCode = 0;
@@ -445,7 +445,7 @@ impl BenchState {
         let fuel = options.wasm.fuel;
 
         if options.wasi.common != Some(false) {
-            wasmtime_wasi::preview1::add_to_linker_sync(&mut linker, |cx| &mut cx.wasi)?;
+            wasmtime_wasi::p1::add_to_linker_sync(&mut linker, |cx| &mut cx.wasi)?;
         }
 
         #[cfg(feature = "wasi-nn")]

crates/c-api/Cargo.toml

@@ -33,7 +33,7 @@ wat = { workspace = true, optional = true }
 # Optional dependencies for the `wasi` feature
 cap-std = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true, features = ["fs"] }
-wasmtime-wasi = { workspace = true, optional = true, features = ["preview1"] }
+wasmtime-wasi = { workspace = true, optional = true, features = ["p1"] }
 
 # Optional dependencies for the `async` feature
 futures = { workspace = true, optional = true }

crates/c-api/src/linker.rs

@@ -112,7 +112,7 @@ pub extern "C" fn wasmtime_linker_define_wasi(
     linker: &mut wasmtime_linker_t,
 ) -> Option<Box<wasmtime_error_t>> {
     handle_result(
-        wasmtime_wasi::preview1::add_to_linker_sync(&mut linker.linker, |ctx| {
+        wasmtime_wasi::p1::add_to_linker_sync(&mut linker.linker, |ctx| {
             ctx.wasi.as_mut().expect("wasi context must be populated")
         }),
         |_linker| (),

crates/c-api/src/store.rs

@@ -83,7 +83,7 @@ wasmtime_c_api_macros::declare_own!(wasmtime_store_t);
 pub struct WasmtimeStoreData {
     foreign: crate::ForeignData,
     #[cfg(feature = "wasi")]
-    pub(crate) wasi: Option<wasmtime_wasi::preview1::WasiP1Ctx>,
+    pub(crate) wasi: Option<wasmtime_wasi::p1::WasiP1Ctx>,
 
     /// Temporary storage for usage during a wasm->host call to store values
     /// in a slice we pass to the C API.

crates/c-api/src/wasi.rs

@@ -7,7 +7,7 @@ use std::fs::File;
 use std::path::Path;
 use std::slice;
 use wasmtime_wasi::WasiCtxBuilder;
-use wasmtime_wasi::preview1::WasiP1Ctx;
+use wasmtime_wasi::p1::WasiP1Ctx;
 
 unsafe fn cstr_to_path<'a>(path: *const c_char) -> Option<&'a Path> {
     CStr::from_ptr(path).to_str().map(Path::new).ok()

crates/wasi-nn/Cargo.toml

@@ -59,7 +59,7 @@ walkdir = { workspace = true }
 cap-std = { workspace = true }
 libtest-mimic = { workspace = true }
 test-programs-artifacts = { workspace = true }
-wasmtime-wasi = { workspace = true, features = ["preview1"] }
+wasmtime-wasi = { workspace = true, features = ["p1"] }
 wasmtime = { workspace = true, features = ["cranelift"] }
 tracing-subscriber = { workspace = true }