Fold imfs::new back into imfs

src/commands/build.rs

@@ -9,7 +9,7 @@ use failure::Fail;
 use rbx_dom_weak::RbxInstanceProperties;
 
 use crate::{
-    imfs::new::{FsError, Imfs, RealFetcher, WatchMode},
+    imfs::{FsError, Imfs, RealFetcher, WatchMode},
     snapshot::{apply_patch_set, compute_patch_set, InstancePropertiesWithMeta, RojoTree},
     snapshot_middleware::snapshot_from_imfs,
 };

src/commands/serve.rs

@@ -4,7 +4,7 @@ use failure::Fail;
 use rbx_dom_weak::RbxInstanceProperties;
 
 use crate::{
-    imfs::new::{Imfs, RealFetcher, WatchMode},
+    imfs::{Imfs, RealFetcher, WatchMode},
     project::{Project, ProjectLoadError},
     serve_session::ServeSession,
     snapshot::{apply_patch_set, compute_patch_set, InstancePropertiesWithMeta, RojoTree},

src/commands/upload.rs

@@ -6,7 +6,7 @@ use reqwest::header::{ACCEPT, CONTENT_TYPE, COOKIE, USER_AGENT};
 
 use crate::{
     auth_cookie::get_auth_cookie,
-    imfs::new::{Imfs, RealFetcher, WatchMode},
+    imfs::{Imfs, RealFetcher, WatchMode},
     snapshot::{apply_patch_set, compute_patch_set, InstancePropertiesWithMeta, RojoTree},
     snapshot_middleware::snapshot_from_imfs,
 };

src/imfs/mod.rs

@@ -6,12 +6,8 @@ mod real_fetcher;
 mod snapshot;
 
 pub use error::*;
-
+pub use fetcher::*;
-pub mod new {
+pub use imfs::*;
-    pub use super::error::*;
+pub use noop_fetcher::*;
-    pub use super::fetcher::*;
+pub use real_fetcher::*;
-    pub use super::imfs::*;
+pub use snapshot::*;
-    pub use super::noop_fetcher::*;
-    pub use super::real_fetcher::*;
-    pub use super::snapshot::*;
-}

src/serve_session.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use crate::{
-    imfs::new::{Imfs, ImfsFetcher},
+    imfs::{Imfs, ImfsFetcher},
     message_queue::MessageQueue,
     project::Project,
     session_id::SessionId,

src/snapshot_middleware/csv.rs

@@ -5,7 +5,7 @@ use rbx_dom_weak::{RbxId, RbxTree, RbxValue};
 use serde::Serialize;
 
 use crate::{
-    imfs::new::{Imfs, ImfsEntry, ImfsFetcher},
+    imfs::{Imfs, ImfsEntry, ImfsFetcher},
     snapshot::InstanceSnapshot,
 };
 
@@ -136,7 +136,7 @@ fn convert_localization_csv(contents: &[u8]) -> String {
 mod test {
     use super::*;
 
-    use crate::imfs::new::{ImfsSnapshot, NoopFetcher};
+    use crate::imfs::{ImfsSnapshot, NoopFetcher};
 
     #[test]
     fn csv_from_imfs() {

src/snapshot_middleware/dir.rs

@@ -3,7 +3,7 @@ use std::{borrow::Cow, collections::HashMap};
 use rbx_dom_weak::{RbxId, RbxTree};
 
 use crate::{
-    imfs::new::{DirectorySnapshot, Imfs, ImfsEntry, ImfsFetcher, ImfsSnapshot},
+    imfs::{DirectorySnapshot, Imfs, ImfsEntry, ImfsFetcher, ImfsSnapshot},
     snapshot::InstanceSnapshot,
 };
 
@@ -78,7 +78,7 @@ mod test {
 
     use maplit::hashmap;
 
-    use crate::imfs::new::NoopFetcher;
+    use crate::imfs::NoopFetcher;
 
     #[test]
     fn empty_folder() {

src/snapshot_middleware/json_model.rs

@@ -5,7 +5,7 @@ use rbx_reflection::try_resolve_value;
 use serde::Deserialize;
 
 use crate::{
-    imfs::new::{Imfs, ImfsEntry, ImfsFetcher},
+    imfs::{Imfs, ImfsEntry, ImfsFetcher},
     snapshot::InstanceSnapshot,
 };
 
@@ -136,7 +136,7 @@ mod test {
     use maplit::hashmap;
     use rbx_dom_weak::RbxValue;
 
-    use crate::imfs::new::{ImfsSnapshot, NoopFetcher};
+    use crate::imfs::{ImfsSnapshot, NoopFetcher};
 
     #[test]
     fn model_from_imfs() {

src/snapshot_middleware/lua.rs

@@ -4,7 +4,7 @@ use maplit::hashmap;
 use rbx_dom_weak::{RbxId, RbxTree, RbxValue};
 
 use crate::{
-    imfs::new::{FsResultExt, Imfs, ImfsEntry, ImfsFetcher},
+    imfs::{FsResultExt, Imfs, ImfsEntry, ImfsFetcher},
     snapshot::InstanceSnapshot,
 };
 
@@ -141,7 +141,7 @@ mod test {
 
     use maplit::hashmap;
 
-    use crate::imfs::new::{ImfsSnapshot, NoopFetcher};
+    use crate::imfs::{ImfsSnapshot, NoopFetcher};
 
     #[test]
     fn module_from_imfs() {

src/snapshot_middleware/middleware.rs

@@ -3,10 +3,7 @@ use std::path::{Path, PathBuf};
 use rbx_dom_weak::{RbxId, RbxTree};
 
 use crate::{
-    imfs::{
+    imfs::{FsResult, Imfs, ImfsEntry, ImfsFetcher, ImfsSnapshot},
-        new::{Imfs, ImfsEntry, ImfsFetcher, ImfsSnapshot},
-        FsResult,
-    },
     snapshot::InstanceSnapshot,
 };
 

src/snapshot_middleware/mod.rs

@@ -28,7 +28,7 @@ use self::{
     rbxmx::SnapshotRbxmx,
     txt::SnapshotTxt,
 };
-use crate::imfs::new::{Imfs, ImfsEntry, ImfsFetcher};
+use crate::imfs::{Imfs, ImfsEntry, ImfsFetcher};
 
 macro_rules! middlewares {
     ( $($middleware: ident,)* ) => {

src/snapshot_middleware/project.rs

@@ -4,10 +4,7 @@ use rbx_dom_weak::{RbxId, RbxTree};
 use rbx_reflection::try_resolve_value;
 
 use crate::{
-    imfs::{
+    imfs::{FsErrorKind, Imfs, ImfsEntry, ImfsFetcher},
-        new::{Imfs, ImfsEntry, ImfsFetcher},
-        FsErrorKind,
-    },
     project::{Project, ProjectNode},
     snapshot::{InstanceMetadata, InstanceSnapshot},
 };
@@ -146,7 +143,7 @@ mod test {
     use maplit::hashmap;
     use rbx_dom_weak::RbxValue;
 
-    use crate::imfs::new::{ImfsSnapshot, NoopFetcher};
+    use crate::imfs::{ImfsSnapshot, NoopFetcher};
 
     #[test]
     fn project_from_folder() {

src/snapshot_middleware/rbxm.rs

@@ -3,7 +3,7 @@ use std::{borrow::Cow, collections::HashMap};
 use rbx_dom_weak::{RbxId, RbxInstanceProperties, RbxTree};
 
 use crate::{
-    imfs::new::{Imfs, ImfsEntry, ImfsFetcher},
+    imfs::{Imfs, ImfsEntry, ImfsFetcher},
     snapshot::InstanceSnapshot,
 };
 
@@ -66,7 +66,7 @@ impl SnapshotMiddleware for SnapshotRbxm {
 mod test {
     use super::*;
 
-    use crate::imfs::new::{ImfsSnapshot, NoopFetcher};
+    use crate::imfs::{ImfsSnapshot, NoopFetcher};
 
     #[test]
     fn model_from_imfs() {

src/snapshot_middleware/rbxmx.rs

@@ -3,7 +3,7 @@ use std::borrow::Cow;
 use rbx_dom_weak::{RbxId, RbxTree};
 
 use crate::{
-    imfs::new::{Imfs, ImfsEntry, ImfsFetcher},
+    imfs::{Imfs, ImfsEntry, ImfsFetcher},
     snapshot::InstanceSnapshot,
 };
 
@@ -64,7 +64,7 @@ mod test {
 
     use std::collections::HashMap;
 
-    use crate::imfs::new::{ImfsSnapshot, NoopFetcher};
+    use crate::imfs::{ImfsSnapshot, NoopFetcher};
 
     #[test]
     fn model_from_imfs() {

src/snapshot_middleware/txt.rs

@@ -4,7 +4,7 @@ use maplit::hashmap;
 use rbx_dom_weak::{RbxId, RbxTree, RbxValue};
 
 use crate::{
-    imfs::new::{FileSnapshot, Imfs, ImfsEntry, ImfsFetcher, ImfsSnapshot},
+    imfs::{FileSnapshot, Imfs, ImfsEntry, ImfsFetcher, ImfsSnapshot},
     snapshot::InstanceSnapshot,
 };
 
@@ -94,7 +94,7 @@ mod test {
     use maplit::hashmap;
     use rbx_dom_weak::RbxInstanceProperties;
 
-    use crate::imfs::new::NoopFetcher;
+    use crate::imfs::NoopFetcher;
 
     #[test]
     fn instance_from_imfs() {

src/web/api.rs

@@ -9,7 +9,7 @@ use hyper::{service::Service, Body, Method, Request, StatusCode};
 use rbx_dom_weak::RbxId;
 
 use crate::{
-    imfs::new::ImfsFetcher,
+    imfs::ImfsFetcher,
     serve_session::ServeSession,
     web::{
         interface::{

src/web/mod.rs

@@ -12,7 +12,7 @@ use futures::{
 use hyper::{service::Service, Body, Request, Response, Server};
 use log::trace;
 
-use crate::{imfs::new::ImfsFetcher, serve_session::ServeSession};
+use crate::{imfs::ImfsFetcher, serve_session::ServeSession};
 
 use self::{api::ApiService, ui::UiService};
 

src/web/ui.rs

@@ -7,7 +7,7 @@ use hyper::{header, service::Service, Body, Method, Request, Response, StatusCod
 use ritz::html;
 
 use crate::{
-    imfs::new::ImfsFetcher,
+    imfs::ImfsFetcher,
     serve_session::ServeSession,
     web::{
         interface::{ErrorResponse, SERVER_VERSION},