chore: shorten network and filesystem module names

Signed-off-by: Roman Volosatovs <[email protected]>

Author: rvolosatovs

crates/wasi/src/filesystem.rs renamed to crates/wasi/src/fs.rs

@@ -13,8 +13,8 @@
 
 mod clocks;
 mod error;
-mod filesystem;
-mod network;
+mod fs;
+mod net;
 pub mod p2;
 #[cfg(feature = "preview1")]
 pub mod preview0;
@@ -25,8 +25,8 @@ pub mod runtime;
 
 pub use self::clocks::{HostMonotonicClock, HostWallClock};
 pub use self::error::{I32Exit, TrappableError};
-pub use self::filesystem::{DirPerms, FilePerms, OpenMode};
-pub use self::network::{Network, SocketAddrUse};
+pub use self::fs::{DirPerms, FilePerms, OpenMode};
+pub use self::net::{Network, SocketAddrUse};
 pub use self::random::{thread_rng, Deterministic};
 #[doc(no_inline)]
 pub use async_trait::async_trait;

crates/wasi/src/lib.rs

@@ -419,7 +419,7 @@ mod async_io {
 
             // Configure all other resources to be concrete types defined in
             // this crate
-            "wasi:sockets/network/network": crate::network::Network,
+            "wasi:sockets/network/network": crate::net::Network,
             "wasi:sockets/tcp/tcp-socket": crate::p2::tcp::TcpSocket,
             "wasi:sockets/udp/udp-socket": crate::p2::udp::UdpSocket,
             "wasi:sockets/udp/incoming-datagram-stream": crate::p2::udp::IncomingDatagramStream,

crates/wasi/src/network.rs renamed to crates/wasi/src/net.rs

@@ -2,7 +2,7 @@ use crate::clocks::{
     host::{monotonic_clock, wall_clock},
     HostMonotonicClock, HostWallClock,
 };
-use crate::network::{SocketAddrCheck, SocketAddrUse};
+use crate::net::{SocketAddrCheck, SocketAddrUse};
 use crate::p2::{
     filesystem::Dir,
     pipe, stdio,

crates/wasi/src/p2/bindings.rs

@@ -1,4 +1,4 @@
-use crate::network::Network;
+use crate::net::Network;
 use crate::p2::bindings::sockets::instance_network;
 use crate::p2::{IoView, WasiImpl, WasiView};
 use wasmtime::component::Resource;

crates/wasi/src/p2/ctx.rs

@@ -245,7 +245,7 @@ pub(crate) mod util {
     use std::net::{IpAddr, Ipv6Addr, SocketAddr};
     use std::time::Duration;
 
-    use crate::network::SocketAddressFamily;
+    use crate::net::SocketAddressFamily;
     use cap_net_ext::{AddressFamily, Blocking, UdpSocketExt};
     use rustix::fd::{AsFd, OwnedFd};
     use rustix::io::Errno;

crates/wasi/src/p2/host/instance_network.rs

@@ -1,4 +1,4 @@
-use crate::network::{SocketAddrUse, SocketAddressFamily};
+use crate::net::{SocketAddrUse, SocketAddressFamily};
 use crate::p2::bindings::{
     sockets::network::{IpAddressFamily, IpSocketAddress, Network},
     sockets::tcp::{self, ShutdownType},

crates/wasi/src/p2/host/network.rs

@@ -1,4 +1,4 @@
-use crate::network::{SocketAddrUse, SocketAddressFamily};
+use crate::net::{SocketAddrUse, SocketAddressFamily};
 use crate::p2::bindings::sockets::network::{ErrorCode, IpAddressFamily, IpSocketAddress, Network};
 use crate::p2::bindings::sockets::udp;
 use crate::p2::host::network::util;

crates/wasi/src/p2/host/tcp.rs

@@ -1,4 +1,4 @@
-use crate::network::{SocketAddressFamily, DEFAULT_TCP_BACKLOG};
+use crate::net::{SocketAddressFamily, DEFAULT_TCP_BACKLOG};
 use crate::p2::bindings::sockets::tcp::ErrorCode;
 use crate::p2::host::network;
 use crate::p2::{

crates/wasi/src/p2/host/udp.rs

@@ -1,4 +1,4 @@
-use crate::network::{SocketAddrCheck, SocketAddressFamily};
+use crate::net::{SocketAddrCheck, SocketAddressFamily};
 use crate::p2::host::network::util;
 use crate::runtime::with_ambient_tokio_runtime;
 use async_trait::async_trait;