Support cli args in the adapter (fastly#394)

Integrate the adapter allocator changes from bytecodealliance/wasmtime#8594,
which simplifies supporting cli args.

Additionally, enable the cli args test for components, as it's now passing.

cli/tests/integration/args.rs

@@ -26,10 +26,6 @@ async fn empty_ok_response_by_default_after_args() -> TestResult {
 ///
 /// `args.wasm` is a guest program checks its cli args.
 #[tokio::test(flavor = "multi_thread")]
-// TODO: The adapter needs to plumb through support for argument handling. This was removed
-// explicitly when we thought we would target the proxy world only, but we'll need it back to
-// simplify adapting programs from languages that need a non-empty args list.
-#[should_panic]
 async fn empty_ok_response_by_default_after_args_component() {
     let resp = Test::using_fixture("args.wasm")
         .adapt_component(true)

crates/adapter/src/descriptors.rs

@@ -1,6 +1,6 @@
 use crate::bindings::wasi::cli::{stderr, stdin, stdout};
 use crate::bindings::wasi::io::streams::{InputStream, OutputStream};
-use crate::{BumpArena, ImportAlloc, TrappingUnwrap};
+use crate::{State, TrappingUnwrap};
 use core::cell::{Cell, OnceCell, UnsafeCell};
 use core::mem::MaybeUninit;
 use wasi::{Errno, Fd};
@@ -78,7 +78,7 @@ pub struct Descriptors {
 }
 
 impl Descriptors {
-    pub fn new(_import_alloc: &ImportAlloc, _arena: &BumpArena) -> Self {
+    pub fn new(_state: &State) -> Self {
         let d = Descriptors {
             table: UnsafeCell::new(MaybeUninit::uninit()),
             table_len: Cell::new(0),

crates/adapter/src/fastly/macros.rs

@@ -2,7 +2,7 @@
 macro_rules! with_buffer {
     ($buf:expr, $len:expr, $alloc:block, |$res:ident| $free:block) => {
         crate::State::with::<FastlyStatus>(|state| {
-            let $res = state.import_alloc.with_buffer($buf, $len, || $alloc);
+            let $res = state.with_one_import_alloc($buf, $len, || $alloc);
             $free;
             Ok(())
         })