Merge pull request #159 from bytecodealliance/pch/move_host_to_common

Move all library code from `host` into `wasi-common`

Author: pchickey

Cargo.lock

@@ -25,10 +25,12 @@ rustix = "0.37.9"
 async-trait = "0.1.59"
 io-lifetimes = { version = "1.0.0", default-features = false }
 wasi-common = { path = "wasi-common" }
+wasi-cap-std-sync = { path = "wasi-common/cap-std-sync" }
 once_cell = "1.12.0"
 system-interface = { version = "0.25.1", features = ["cap_std_impls"] }
 wit-bindgen = { version = "0.4.0", default-features = false }
 ipnet = "2" # TODO: Move to cap_std::ipnet instead, when that's released.
+wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "299131ae2d6655c49138bfab2c4469650763ef3b", features = ["component-model"] }
 
 [dependencies]
 wasi = { version = "0.11.0", default-features = false }

Cargo.toml

@@ -5,20 +5,17 @@ edition.workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
-thiserror = { workspace = true }
-async-trait = { workspace = true }
 cap-std = { workspace = true }
-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 = "299131ae2d6655c49138bfab2c4469650763ef3b", features = ["component-model"] }
-wasi-common = { path = "../wasi-common" }
-wasi-cap-std-sync = { path = "../wasi-common/cap-std-sync" }
+wasmtime = { workspace = true }
+wasi-common = { workspace = true }
+wasi-cap-std-sync = { workspace = true }
 clap = { version = "4.1.9", features = ["derive"] }
 tracing-subscriber = { version = "0.3", default-features = false, features = ["env-filter", "fmt" ]}
+tokio = { version = "1", features = ["full"] }
 
 [dev-dependencies]
+tracing = { workspace = true }
+cap-rand = { workspace = true }
 test-programs-macros = { path = "../test-programs/macros" }
 test-log = { version = "0.2", default-features = false, features = ["trace"] }
 tempfile = "3.3.0"

host/Cargo.toml

@@ -1,6 +1,6 @@
 use anyhow::{Context, Result};
-use host::{wasi, WasiCtx};
 use wasi_cap_std_sync::WasiCtxBuilder;
+use wasi_common::{wasi, WasiCtx};
 use wasmtime::{
     component::{Component, Linker},
     Config, Engine, Store,

host/src/main.rs

@@ -1,7 +1,6 @@
 use anyhow::Result;
 use cap_rand::RngCore;
 use cap_std::{ambient_authority, fs::Dir, time::Duration};
-use host::{wasi::command::add_to_linker, wasi::command::Command, WasiCtx};
 use std::{
     io::{Cursor, Write},
     sync::Mutex,
@@ -12,6 +11,7 @@ use wasi_common::{
     dir::ReadOnlyDir,
     pipe::ReadPipe,
 };
+use wasi_common::{wasi::command::add_to_linker, wasi::command::Command, WasiCtx};
 use wasmtime::{
     component::{Component, Linker},
     Config, Engine, Store,