From ae4c5a9d7fe531041a4896ff4e7d30fa6a50db0e Mon Sep 17 00:00:00 2001
From: Pat Hickey <pat@moreproductive.org>
Date: Fri, 26 Mar 2021 15:37:57 -0700
Subject: [PATCH] fixes in tests and examples

---
 examples/linking.rs     | 3 +--
 examples/wasi/main.rs   | 3 +--
 tests/all/host_funcs.rs | 3 +--
 tests/all/traps.rs      | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/examples/linking.rs b/examples/linking.rs
index 11f4022bcd..b4cee53a4a 100644
--- a/examples/linking.rs
+++ b/examples/linking.rs
@@ -3,9 +3,8 @@
 // You can execute this example with `cargo run --example linking`
 
 use anyhow::Result;
-use wasi_cap_std_sync::WasiCtxBuilder;
 use wasmtime::*;
-use wasmtime_wasi::Wasi;
+use wasmtime_wasi::{sync::WasiCtxBuilder, Wasi};
 
 fn main() -> Result<()> {
     let engine = Engine::default();
diff --git a/examples/wasi/main.rs b/examples/wasi/main.rs
index f1487171f7..f808be3eca 100644
--- a/examples/wasi/main.rs
+++ b/examples/wasi/main.rs
@@ -4,9 +4,8 @@
 // You can execute this example with `cargo run --example wasi`
 
 use anyhow::Result;
-use wasi_cap_std_sync::WasiCtxBuilder;
 use wasmtime::*;
-use wasmtime_wasi::Wasi;
+use wasmtime_wasi::{sync::WasiCtxBuilder, Wasi};
 
 fn main() -> Result<()> {
     tracing_subscriber::FmtSubscriber::builder()
diff --git a/tests/all/host_funcs.rs b/tests/all/host_funcs.rs
index 26d4329941..360e2526ad 100644
--- a/tests/all/host_funcs.rs
+++ b/tests/all/host_funcs.rs
@@ -1,8 +1,7 @@
 use anyhow::Result;
 use std::sync::atomic::{AtomicUsize, Ordering::SeqCst};
-use wasi_cap_std_sync::WasiCtxBuilder;
 use wasmtime::*;
-use wasmtime_wasi::Wasi;
+use wasmtime_wasi::{sync::WasiCtxBuilder, Wasi};
 
 #[test]
 fn async_required() {
diff --git a/tests/all/traps.rs b/tests/all/traps.rs
index b83ac38daa..a4686e9073 100644
--- a/tests/all/traps.rs
+++ b/tests/all/traps.rs
@@ -512,7 +512,7 @@ fn parse_dwarf_info() -> Result<()> {
     let mut linker = Linker::new(&store);
     wasmtime_wasi::Wasi::new(
         &store,
-        wasi_cap_std_sync::WasiCtxBuilder::new()
+        wasmtime_wasi::sync::WasiCtxBuilder::new()
             .inherit_stdio()
             .build()?,
     )