chore: adapt to Accessor API changes

- hide `CommandPre`, since it is currently unusable
  #11249
- use `Command::new` directly in examples, since `instantiate_async`
  does not provide a way to call an export

Signed-off-by: Roman Volosatovs <[email protected]>

Author: rvolosatovs

crates/wasi/src/p3/bindings.rs

@@ -220,8 +220,11 @@ pub use self::generated::wasi::*;
 ///     );
 ///
 ///     // Instantiate the component and we're off to the races.
-///     let command = Command::instantiate_async(&mut store, &component, &linker).await?;
-///     let program_result = command.wasi_cli_run().call_run(&mut store).await?;
+///     let instance = linker.instantiate_async(&mut store, &component).await?;
+///     let command = Command::new(&mut store, &instance)?;
+///     let program_result = instance.run_with(&mut store, async move |store| {
+///         command.wasi_cli_run().call_run(store).await
+///     }).await??;
 ///     match program_result {
 ///         Ok(()) => Ok(()),
 ///         Err(()) => std::process::exit(1),
@@ -286,7 +289,10 @@ pub use self::generated::Command;
 ///
 ///     // Instantiate the component and we're off to the races.
 ///     let command = pre.instantiate_async(&mut store).await?;
-///     let program_result = command.wasi_cli_run().call_run(&mut store).await?;
+///     // TODO: Construct an accessor from `store` to call `run`
+///     // https://github.com/bytecodealliance/wasmtime/issues/11249
+///     //let program_result = command.wasi_cli_run().call_run(&mut store).await?;
+///     let program_result = todo!();
 ///     match program_result {
 ///         Ok(()) => Ok(()),
 ///         Err(()) => std::process::exit(1),
@@ -303,6 +309,10 @@ pub use self::generated::Command;
 /// ```
 ///
 /// ---
+// TODO: Make this public, once `CommandPre` can be used for
+// calling exports
+// https://github.com/bytecodealliance/wasmtime/issues/11249
+#[doc(hidden)]
 pub use self::generated::CommandPre;
 
 pub use self::generated::CommandIndices;

crates/wasi/src/p3/clocks/host.rs

@@ -47,7 +47,7 @@ where
     T: WasiClocksView + 'static,
 {
     async fn wait_until<U>(
-        store: &mut Accessor<U, Self>,
+        store: &Accessor<U, Self>,
         when: monotonic_clock::Instant,
     ) -> wasmtime::Result<()> {
         let clock_now = store.with(|mut view| view.get().clocks().monotonic_clock.now());
@@ -58,7 +58,7 @@ where
     }
 
     async fn wait_for<U>(
-        _store: &mut Accessor<U, Self>,
+        _store: &Accessor<U, Self>,
         duration: monotonic_clock::Duration,
     ) -> wasmtime::Result<()> {
         if duration > 0 {

crates/wasi/tests/all/p3/mod.rs

@@ -77,9 +77,10 @@ async fn run(path: &str) -> anyhow::Result<()> {
     let instance = linker.instantiate_async(&mut store, &component).await?;
     let command =
         Command::new(&mut store, &instance).context("failed to instantiate `wasi:cli/command`")?;
-    let run = command.wasi_cli_run().call_run(&mut store);
     instance
-        .run(&mut store, run)
+        .run_with(&mut store, async move |store| {
+            command.wasi_cli_run().call_run(store).await
+        })
         .await
         .context("failed to call `wasi:cli/run#run`")?
         .context("guest trapped")?