Update Wasmtime/tooling dependencies (#14)

This forces all the `*.wit.md` file to go into one large `*.wit` file
for now which will get split up later once `use` is re-introduced.

Author: alexcrichton

Cargo.lock

@@ -7,14 +7,7 @@ mod table;
 pub use table::Table;
 
 wit_bindgen_host_wasmtime_rust::generate!({
-    import: "../wit/wasi-clocks.wit.md",
-    import: "../wit/wasi-default-clocks.wit.md",
-    import: "../wit/wasi-filesystem.wit.md",
-    import: "../wit/wasi-logging.wit.md",
-    import: "../wit/wasi-poll.wit.md",
-    import: "../wit/wasi-random.wit.md",
-    default: "../wit/command.wit.md",
-    name: "wasi",
+    path: "../wit/wasi.wit",
     tracing: true,
 });
 

host/src/lib.rs

@@ -1,28 +1,26 @@
 #![allow(unused_variables)] // TODO: remove this when more things are implemented
 
-wit_bindgen_guest_rust::generate!({
-    import: "wit/wasi-clocks.wit.md",
-    import: "wit/wasi-default-clocks.wit.md",
-    import: "wit/wasi-filesystem.wit.md",
-    import: "wit/wasi-logging.wit.md",
-    import: "wit/wasi-poll.wit.md",
-    import: "wit/wasi-random.wit.md",
-    default: "wit/command.wit.md",
-    name: "wasi_command",
-    no_std,
-    raw_strings,
-    unchecked,
-    // The generated definition of command will pull in std, so we are defining it
-    // manually below instead
-    skip: ["command"],
-});
-
+use crate::bindings::{
+    wasi_clocks, wasi_default_clocks, wasi_filesystem, wasi_logging, wasi_random,
+};
 use core::arch::wasm32::unreachable;
 use core::mem::{forget, size_of};
 use core::ptr::{copy_nonoverlapping, null_mut};
 use core::slice;
 use wasi::*;
 
+mod bindings {
+    wit_bindgen_guest_rust::generate!({
+        path: "wit/wasi.wit",
+        no_std,
+        raw_strings,
+        unchecked,
+        // The generated definition of command will pull in std, so we are defining it
+        // manually below instead
+        skip: ["command"],
+    });
+}
+
 #[export_name = "command"]
 unsafe extern "C" fn command_entrypoint(stdin: i32, stdout: i32, _args_ptr: i32, _args_len: i32) {
     *Descriptor::get(0) = Descriptor::File(File {

src/lib.rs

@@ -13,4 +13,4 @@ test = false
 quote = "1.0"
 
 [build-dependencies]
-wit-component = { git = "https://github.com/bytecodealliance/wit-bindgen" }
+wit-component = "0.3.2"

test-programs/macros/Cargo.toml

@@ -23,6 +23,7 @@ fn main() {
 
     let wasi_adapter = out_dir.join("wasm32-wasi/release/wasi_snapshot_preview1.wasm");
     println!("wasi adapter: {:?}", &wasi_adapter);
+    let wasi_adapter = fs::read(&wasi_adapter).unwrap();
 
     let mut cmd = Command::new("cargo");
     cmd.arg("build")
@@ -46,7 +47,7 @@ fn main() {
             .module(module.as_slice())
             .unwrap()
             .validate(true)
-            .adapter_file(&wasi_adapter)
+            .adapter("wasi_snapshot_preview1", &wasi_adapter)
             .unwrap()
             .encode()
             .expect(&format!(