host: deduplicate generated traits using only_interfaces

host/Cargo.toml

@@ -12,7 +12,7 @@ cap-rand = { workspace = true }
 cap-net-ext = { workspace = true }
 tokio = { version = "1.22.0", features = [ "rt", "macros" ] }
 tracing = { workspace = true }
-wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "cc1c14ac913be13329e5cfc91c33e053ab722132", features = ["component-model"] }
+wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "299131ae2d6655c49138bfab2c4469650763ef3b", features = ["component-model"] }
 wasi-common = { path = "../wasi-common" }
 wasi-cap-std-sync = { path = "../wasi-common/cap-std-sync" }
 clap = { version = "4.1.9", features = ["derive"] }

host/src/clocks.rs

@@ -1,12 +1,12 @@
 #![allow(unused_variables)]
 
-use crate::command::wasi::{
+use crate::poll::PollableEntry;
+use crate::wasi::{
     monotonic_clock::{self, Instant},
     poll::Pollable,
     timezone::{self, Timezone, TimezoneDisplay},
     wall_clock::{self, Datetime},
 };
-use crate::poll::PollableEntry;
 use crate::WasiCtx;
 use cap_std::time::SystemTime;
 

host/src/default_outgoing_http.rs

@@ -1,8 +1,6 @@
 use crate::{
-    proxy::wasi,
-    proxy::wasi::types::{
-        FutureIncomingResponse as Response, OutgoingRequest as Request, RequestOptions,
-    },
+    wasi,
+    wasi::types::{FutureIncomingResponse as Response, OutgoingRequest as Request, RequestOptions},
     WasiCtx,
 };
 

host/src/env.rs

@@ -1,4 +1,4 @@
-use crate::command::wasi;
+use crate::wasi;
 use crate::WasiCtx;
 
 #[async_trait::async_trait]

host/src/exit.rs

@@ -1,4 +1,4 @@
-use crate::command::wasi::exit;
+use crate::wasi::exit;
 use crate::WasiCtx;
 
 #[async_trait::async_trait]

host/src/filesystem.rs

@@ -1,7 +1,7 @@
 #![allow(unused_variables)]
 
-use crate::command::wasi;
-use crate::command::wasi::streams::{InputStream, OutputStream};
+use crate::wasi;
+use crate::wasi::streams::{InputStream, OutputStream};
 use crate::WasiCtx;
 use anyhow::anyhow;
 use std::{

host/src/http_types.rs

@@ -1,7 +1,7 @@
 use crate::{
-    proxy::wasi,
-    proxy::wasi::poll::Pollable,
-    proxy::wasi::types::{
+    wasi,
+    wasi::poll::Pollable,
+    wasi::types::{
         Error, Fields, FutureIncomingResponse, Headers, IncomingRequest, IncomingResponse,
         IncomingStream, Method, OutgoingRequest, OutgoingResponse, OutgoingStream,
         ResponseOutparam, Scheme, StatusCode, Trailers,