diff --git a/crates/wasi/src/preview2/preview2/clocks.rs b/crates/wasi/src/preview2/host/clocks.rs similarity index 100% rename from crates/wasi/src/preview2/preview2/clocks.rs rename to crates/wasi/src/preview2/host/clocks.rs diff --git a/crates/wasi/src/preview2/preview2/env.rs b/crates/wasi/src/preview2/host/env.rs similarity index 100% rename from crates/wasi/src/preview2/preview2/env.rs rename to crates/wasi/src/preview2/host/env.rs diff --git a/crates/wasi/src/preview2/preview2/exit.rs b/crates/wasi/src/preview2/host/exit.rs similarity index 100% rename from crates/wasi/src/preview2/preview2/exit.rs rename to crates/wasi/src/preview2/host/exit.rs diff --git a/crates/wasi/src/preview2/preview2/filesystem.rs b/crates/wasi/src/preview2/host/filesystem.rs similarity index 100% rename from crates/wasi/src/preview2/preview2/filesystem.rs rename to crates/wasi/src/preview2/host/filesystem.rs diff --git a/crates/wasi/src/preview2/preview2/filesystem/sync.rs b/crates/wasi/src/preview2/host/filesystem/sync.rs similarity index 100% rename from crates/wasi/src/preview2/preview2/filesystem/sync.rs rename to crates/wasi/src/preview2/host/filesystem/sync.rs diff --git a/crates/wasi/src/preview2/preview2/io.rs b/crates/wasi/src/preview2/host/io.rs similarity index 100% rename from crates/wasi/src/preview2/preview2/io.rs rename to crates/wasi/src/preview2/host/io.rs diff --git a/crates/wasi/src/preview2/preview2/mod.rs b/crates/wasi/src/preview2/host/mod.rs similarity index 100% rename from crates/wasi/src/preview2/preview2/mod.rs rename to crates/wasi/src/preview2/host/mod.rs diff --git a/crates/wasi/src/preview2/preview2/random.rs b/crates/wasi/src/preview2/host/random.rs similarity index 100% rename from crates/wasi/src/preview2/preview2/random.rs rename to crates/wasi/src/preview2/host/random.rs diff --git a/crates/wasi/src/preview2/mod.rs b/crates/wasi/src/preview2/mod.rs index f336acbff060..f86cec58f3b9 100644 --- a/crates/wasi/src/preview2/mod.rs +++ b/crates/wasi/src/preview2/mod.rs @@ -20,11 +20,11 @@ pub mod command; mod ctx; mod error; mod filesystem; +mod host; pub mod pipe; mod poll; #[cfg(feature = "preview1-on-preview2")] pub mod preview1; -mod preview2; mod random; mod stdio; mod stream; diff --git a/crates/wasi/src/preview2/preview1.rs b/crates/wasi/src/preview2/preview1.rs index 8cd1e798ea9e..2478a197c144 100644 --- a/crates/wasi/src/preview2/preview1.rs +++ b/crates/wasi/src/preview2/preview1.rs @@ -3,7 +3,7 @@ use crate::preview2::bindings::clocks::{monotonic_clock, wall_clock}; use crate::preview2::bindings::filesystem::{preopens, types as filesystem}; use crate::preview2::bindings::io::streams; use crate::preview2::filesystem::TableFsExt; -use crate::preview2::preview2::filesystem::TableReaddirExt; +use crate::preview2::host::filesystem::TableReaddirExt; use crate::preview2::{bindings, TableError, WasiView}; use anyhow::{anyhow, bail, Context}; use std::borrow::Borrow;