From af7030197d39fa76f9b3c93597b6a01c821c246e Mon Sep 17 00:00:00 2001
From: Pat Hickey <pat@moreproductive.org>
Date: Thu, 25 Mar 2021 16:58:06 -0700
Subject: [PATCH] wasmtime-cli: drop direct dep on cap_std by using re-export

---
 Cargo.lock               | 1 -
 Cargo.toml               | 1 -
 crates/c-api/src/wasi.rs | 7 ++++---
 src/commands/run.rs      | 6 ++++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bb27126f3a..0e40dba03d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3269,7 +3269,6 @@ name = "wasmtime-cli"
 version = "0.25.0"
 dependencies = [
  "anyhow",
- "cap-std",
  "env_logger 0.8.3",
  "file-per-thread-logger",
  "filecheck",
diff --git a/Cargo.toml b/Cargo.toml
index dcd82bac6b..be37d8cec7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"
diff --git a/crates/c-api/src/wasi.rs b/crates/c-api/src/wasi.rs
index 828779ea8d..441fa6fa54 100644
--- a/crates/c-api/src/wasi.rs
+++ b/crates/c-api/src/wasi.rs
@@ -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;
@@ -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> {
diff --git a/src/commands/run.rs b/src/commands/run.rs
index 33a5a255ad..f8b7010146 100644
--- a/src/commands/run.rs
+++ b/src/commands/run.rs
@@ -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::{
@@ -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};