Skip to content

Commit

Permalink
wasmtime-cli: drop direct dep on cap_std by using re-export
Browse files Browse the repository at this point in the history
  • Loading branch information
pchickey committed Mar 26, 2021
1 parent 07245a8 commit af70301
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ log = "0.4.8"
rayon = "1.2.1"
humantime = "2.0.0"
wasmparser = "0.77.0"
cap-std = "0.13"

[dev-dependencies]
env_logger = "0.8.1"
Expand Down
7 changes: 4 additions & 3 deletions crates/c-api/src/wasi.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//! The WASI embedding API definitions for Wasmtime.
use crate::{wasm_extern_t, wasm_importtype_t, wasm_store_t, wasm_trap_t};
use anyhow::Result;
use cap_std::fs::Dir;
use std::cell::RefCell;
use std::collections::HashMap;
use std::ffi::CStr;
Expand All @@ -13,8 +12,10 @@ use std::slice;
use std::str;
use wasmtime::{Extern, Linker, Trap};
use wasmtime_wasi::{
snapshots::preview_0::Wasi as WasiSnapshot0, snapshots::preview_1::Wasi as WasiPreview1,
sync::WasiCtxBuilder, WasiCtx,
snapshots::preview_0::Wasi as WasiSnapshot0,
snapshots::preview_1::Wasi as WasiPreview1,
sync::{Dir, WasiCtxBuilder},
WasiCtx,
};

unsafe fn cstr_to_path<'a>(path: *const c_char) -> Option<&'a Path> {
Expand Down
6 changes: 4 additions & 2 deletions src/commands/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
use crate::{init_file_per_thread_logger, CommonOptions};
use anyhow::{bail, Context as _, Result};
use cap_std::fs::Dir;
use std::thread;
use std::time::Duration;
use std::{
Expand All @@ -12,7 +11,10 @@ use std::{
};
use structopt::{clap::AppSettings, StructOpt};
use wasmtime::{Engine, Func, Linker, Module, Store, Trap, Val, ValType};
use wasmtime_wasi::{sync::WasiCtxBuilder, Wasi};
use wasmtime_wasi::{
sync::{Dir, WasiCtxBuilder},
Wasi,
};

#[cfg(feature = "wasi-nn")]
use wasmtime_wasi_nn::{WasiNn, WasiNnCtx};
Expand Down

0 comments on commit af70301

Please sign in to comment.