From 5be4175ac3ddca71b88a93ca2a36dfdc566e0e3f Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Tue, 10 Mar 2020 18:05:31 -0700 Subject: [PATCH] Rename vfs -> memofs across the codebase --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 6 +++--- {vfs => memofs}/Cargo.toml | 4 ++-- {vfs => memofs}/LICENSE.txt | 0 {vfs => memofs}/README.md | 0 {vfs => memofs}/README.tpl | 0 {vfs => memofs}/src/in_memory_fs.rs | 0 {vfs => memofs}/src/lib.rs | 6 ++++-- {vfs => memofs}/src/noop_backend.rs | 0 {vfs => memofs}/src/snapshot.rs | 0 {vfs => memofs}/src/std_backend.rs | 0 src/change_processor.rs | 2 +- src/cli/build.rs | 2 +- src/cli/serve.rs | 2 +- src/cli/upload.rs | 2 +- src/common_setup.rs | 2 +- src/serve_session.rs | 4 ++-- src/snapshot_middleware/csv.rs | 2 +- src/snapshot_middleware/dir.rs | 4 ++-- src/snapshot_middleware/json_model.rs | 4 ++-- src/snapshot_middleware/lua.rs | 4 ++-- src/snapshot_middleware/middleware.rs | 2 +- src/snapshot_middleware/mod.rs | 2 +- src/snapshot_middleware/project.rs | 4 ++-- src/snapshot_middleware/rbxlx.rs | 2 +- src/snapshot_middleware/rbxm.rs | 4 ++-- src/snapshot_middleware/rbxmx.rs | 4 ++-- src/snapshot_middleware/txt.rs | 4 ++-- 28 files changed, 43 insertions(+), 41 deletions(-) rename {vfs => memofs}/Cargo.toml (78%) rename {vfs => memofs}/LICENSE.txt (100%) rename {vfs => memofs}/README.md (100%) rename {vfs => memofs}/README.tpl (100%) rename {vfs => memofs}/src/in_memory_fs.rs (100%) rename {vfs => memofs}/src/lib.rs (99%) rename {vfs => memofs}/src/noop_backend.rs (100%) rename {vfs => memofs}/src/snapshot.rs (100%) rename {vfs => memofs}/src/std_backend.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 42982f53..9cf91fc1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -922,6 +922,14 @@ dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "memofs" +version = "0.1.0" +dependencies = [ + "crossbeam-channel 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "notify 4.0.15 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "mime" version = "0.3.16" @@ -1670,6 +1678,7 @@ dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "memofs 0.1.0", "notify 4.0.15 (registry+https://github.com/rust-lang/crates.io-index)", "paste 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1691,7 +1700,6 @@ dependencies = [ "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "vfs 0.1.0", "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2365,14 +2373,6 @@ name = "version_check" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "vfs" -version = "0.1.0" -dependencies = [ - "crossbeam-channel 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "notify 4.0.15 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "walkdir" version = "2.3.1" diff --git a/Cargo.toml b/Cargo.toml index 6b9d9837..11c606fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,14 +32,14 @@ members = [ "rojo-test", "rojo-insta-ext", "clibrojo", - "vfs", + "memofs", ] default-members = [ ".", "rojo-test", "rojo-insta-ext", - "vfs", + "memofs", ] [lib] @@ -82,7 +82,7 @@ structopt = "0.3.5" termcolor = "1.0.5" tokio = "0.1.22" uuid = { version = "0.8.1", features = ["v4", "serde"] } -vfs = { path = "vfs" } +memofs = { path = "memofs" } [target.'cfg(windows)'.dependencies] winreg = "0.6.2" diff --git a/vfs/Cargo.toml b/memofs/Cargo.toml similarity index 78% rename from vfs/Cargo.toml rename to memofs/Cargo.toml index 96be15c7..09912fb4 100644 --- a/vfs/Cargo.toml +++ b/memofs/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "vfs" +name = "memofs" version = "0.1.0" authors = ["Lucien Greathouse "] edition = "2018" readme = "README.md" license = "MIT" -homepage = "https://github.com/rojo-rbx/rojo/tree/master/vfs" +homepage = "https://github.com/rojo-rbx/rojo/tree/master/memofs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/vfs/LICENSE.txt b/memofs/LICENSE.txt similarity index 100% rename from vfs/LICENSE.txt rename to memofs/LICENSE.txt diff --git a/vfs/README.md b/memofs/README.md similarity index 100% rename from vfs/README.md rename to memofs/README.md diff --git a/vfs/README.tpl b/memofs/README.tpl similarity index 100% rename from vfs/README.tpl rename to memofs/README.tpl diff --git a/vfs/src/in_memory_fs.rs b/memofs/src/in_memory_fs.rs similarity index 100% rename from vfs/src/in_memory_fs.rs rename to memofs/src/in_memory_fs.rs diff --git a/vfs/src/lib.rs b/memofs/src/lib.rs similarity index 99% rename from vfs/src/lib.rs rename to memofs/src/lib.rs index cbdc63da..a04bf71d 100644 --- a/vfs/src/lib.rs +++ b/memofs/src/lib.rs @@ -1,7 +1,9 @@ /*! -Implementation of a virtual filesystem with a configurable backend and file watching. +Implementation of a virtual filesystem with a configurable backend and file +watching. -memofs is currently an unstable minimum viable library. Its primary consumer is [Rojo](https://github.com/rojo-rbx/rojo), a build system for Roblox. +memofs is currently an unstable minimum viable library. Its primary consumer is +[Rojo](https://github.com/rojo-rbx/rojo), a build system for Roblox. ## Current Features * API similar to `std::fs` diff --git a/vfs/src/noop_backend.rs b/memofs/src/noop_backend.rs similarity index 100% rename from vfs/src/noop_backend.rs rename to memofs/src/noop_backend.rs diff --git a/vfs/src/snapshot.rs b/memofs/src/snapshot.rs similarity index 100% rename from vfs/src/snapshot.rs rename to memofs/src/snapshot.rs diff --git a/vfs/src/std_backend.rs b/memofs/src/std_backend.rs similarity index 100% rename from vfs/src/std_backend.rs rename to memofs/src/std_backend.rs diff --git a/src/change_processor.rs b/src/change_processor.rs index 0351f48c..50cdc949 100644 --- a/src/change_processor.rs +++ b/src/change_processor.rs @@ -5,8 +5,8 @@ use std::{ use crossbeam_channel::{select, Receiver, RecvError, Sender}; use jod_thread::JoinHandle; +use memofs::{IoResultExt, Vfs, VfsEvent}; use rbx_dom_weak::{RbxId, RbxValue}; -use vfs::{IoResultExt, Vfs, VfsEvent}; use crate::{ message_queue::MessageQueue, diff --git a/src/cli/build.rs b/src/cli/build.rs index 901bd3d6..11fc7bd7 100644 --- a/src/cli/build.rs +++ b/src/cli/build.rs @@ -3,9 +3,9 @@ use std::{ io::{self, BufWriter, Write}, }; +use memofs::Vfs; use snafu::{ResultExt, Snafu}; use tokio::runtime::Runtime; -use vfs::Vfs; use crate::{ cli::BuildCommand, project::ProjectError, serve_session::ServeSession, snapshot::RojoTree, diff --git a/src/cli/serve.rs b/src/cli/serve.rs index 6a04338c..429ce23b 100644 --- a/src/cli/serve.rs +++ b/src/cli/serve.rs @@ -3,9 +3,9 @@ use std::{ sync::Arc, }; +use memofs::Vfs; use snafu::Snafu; use termcolor::{BufferWriter, Color, ColorChoice, ColorSpec, WriteColor}; -use vfs::Vfs; use crate::{cli::ServeCommand, serve_session::ServeSession, web::LiveServer}; diff --git a/src/cli/upload.rs b/src/cli/upload.rs index f6a7b31b..f6f847af 100644 --- a/src/cli/upload.rs +++ b/src/cli/upload.rs @@ -1,6 +1,6 @@ +use memofs::Vfs; use reqwest::header::{ACCEPT, CONTENT_TYPE, COOKIE, USER_AGENT}; use snafu::{ResultExt, Snafu}; -use vfs::Vfs; use crate::{auth_cookie::get_auth_cookie, cli::UploadCommand, common_setup}; diff --git a/src/common_setup.rs b/src/common_setup.rs index 4ae37d79..7de22c06 100644 --- a/src/common_setup.rs +++ b/src/common_setup.rs @@ -3,8 +3,8 @@ use std::path::Path; +use memofs::Vfs; use rbx_dom_weak::RbxInstanceProperties; -use vfs::Vfs; use crate::{ project::Project, diff --git a/src/serve_session.rs b/src/serve_session.rs index bcaf6c14..8d737733 100644 --- a/src/serve_session.rs +++ b/src/serve_session.rs @@ -6,7 +6,7 @@ use std::{ }; use crossbeam_channel::Sender; -use vfs::Vfs; +use memofs::Vfs; use crate::{ change_processor::ChangeProcessor, @@ -190,9 +190,9 @@ mod serve_session { use std::{path::PathBuf, time::Duration}; use maplit::hashmap; + use memofs::{InMemoryFs, VfsEvent, VfsSnapshot}; use rojo_insta_ext::RedactionMap; use tokio::{runtime::Runtime, timer::Timeout}; - use vfs::{InMemoryFs, VfsEvent, VfsSnapshot}; use crate::tree_view::view_tree; diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs index 93882e22..a819ba44 100644 --- a/src/snapshot_middleware/csv.rs +++ b/src/snapshot_middleware/csv.rs @@ -1,9 +1,9 @@ use std::{collections::BTreeMap, path::Path}; use maplit::hashmap; +use memofs::{IoResultExt, Vfs}; use rbx_dom_weak::RbxValue; use serde::Serialize; -use vfs::{IoResultExt, Vfs}; use crate::snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot}; diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs index 22d1ed64..9ff6d9a3 100644 --- a/src/snapshot_middleware/dir.rs +++ b/src/snapshot_middleware/dir.rs @@ -1,6 +1,6 @@ use std::path::Path; -use vfs::{DirEntry, IoResultExt, Vfs}; +use memofs::{DirEntry, IoResultExt, Vfs}; use crate::snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot}; @@ -87,7 +87,7 @@ mod test { use super::*; use maplit::hashmap; - use vfs::{InMemoryFs, VfsSnapshot}; + use memofs::{InMemoryFs, VfsSnapshot}; #[test] fn empty_folder() { diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs index 2f9ca5e8..8633b818 100644 --- a/src/snapshot_middleware/json_model.rs +++ b/src/snapshot_middleware/json_model.rs @@ -1,9 +1,9 @@ use std::{borrow::Cow, collections::HashMap, path::Path}; +use memofs::Vfs; use rbx_dom_weak::UnresolvedRbxValue; use rbx_reflection::try_resolve_value; use serde::Deserialize; -use vfs::Vfs; use crate::snapshot::{InstanceContext, InstanceSnapshot}; @@ -133,7 +133,7 @@ impl JsonModelCore { mod test { use super::*; - use vfs::{InMemoryFs, VfsSnapshot}; + use memofs::{InMemoryFs, VfsSnapshot}; #[test] fn model_from_vfs() { diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs index fba6b04b..decd6144 100644 --- a/src/snapshot_middleware/lua.rs +++ b/src/snapshot_middleware/lua.rs @@ -1,8 +1,8 @@ use std::{path::Path, str}; use maplit::hashmap; +use memofs::{IoResultExt, Vfs}; use rbx_dom_weak::RbxValue; -use vfs::{IoResultExt, Vfs}; use crate::snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot}; @@ -135,7 +135,7 @@ fn snapshot_init( mod test { use super::*; - use vfs::{InMemoryFs, VfsSnapshot}; + use memofs::{InMemoryFs, VfsSnapshot}; #[test] fn module_from_vfs() { diff --git a/src/snapshot_middleware/middleware.rs b/src/snapshot_middleware/middleware.rs index baf28de2..18e79439 100644 --- a/src/snapshot_middleware/middleware.rs +++ b/src/snapshot_middleware/middleware.rs @@ -1,6 +1,6 @@ use std::path::Path; -use vfs::Vfs; +use memofs::Vfs; use crate::snapshot::{InstanceContext, InstanceSnapshot}; diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs index 24e3611e..77dca702 100644 --- a/src/snapshot_middleware/mod.rs +++ b/src/snapshot_middleware/mod.rs @@ -21,7 +21,7 @@ pub use self::error::*; use std::path::Path; -use vfs::Vfs; +use memofs::Vfs; use self::middleware::{SnapshotInstanceResult, SnapshotMiddleware}; use self::{ diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs index ad16aede..e2d0c3a7 100644 --- a/src/snapshot_middleware/project.rs +++ b/src/snapshot_middleware/project.rs @@ -1,7 +1,7 @@ use std::{borrow::Cow, collections::HashMap, path::Path}; +use memofs::{IoResultExt, Vfs}; use rbx_reflection::try_resolve_value; -use vfs::{IoResultExt, Vfs}; use crate::{ project::{Project, ProjectNode}, @@ -211,7 +211,7 @@ mod test { use super::*; use maplit::hashmap; - use vfs::{InMemoryFs, VfsSnapshot}; + use memofs::{InMemoryFs, VfsSnapshot}; #[test] fn project_from_folder() { diff --git a/src/snapshot_middleware/rbxlx.rs b/src/snapshot_middleware/rbxlx.rs index 16c7f4ea..94cc942d 100644 --- a/src/snapshot_middleware/rbxlx.rs +++ b/src/snapshot_middleware/rbxlx.rs @@ -1,6 +1,6 @@ use std::path::Path; -use vfs::Vfs; +use memofs::Vfs; use crate::snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot}; diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs index f14afdfd..319d316a 100644 --- a/src/snapshot_middleware/rbxm.rs +++ b/src/snapshot_middleware/rbxm.rs @@ -1,7 +1,7 @@ use std::{collections::HashMap, path::Path}; +use memofs::Vfs; use rbx_dom_weak::{RbxInstanceProperties, RbxTree}; -use vfs::Vfs; use crate::snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot}; @@ -59,7 +59,7 @@ impl SnapshotMiddleware for SnapshotRbxm { mod test { use super::*; - use vfs::{InMemoryFs, VfsSnapshot}; + use memofs::{InMemoryFs, VfsSnapshot}; #[test] fn model_from_vfs() { diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs index c697336d..90193b62 100644 --- a/src/snapshot_middleware/rbxmx.rs +++ b/src/snapshot_middleware/rbxmx.rs @@ -1,6 +1,6 @@ use std::path::Path; -use vfs::Vfs; +use memofs::Vfs; use crate::snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot}; @@ -54,7 +54,7 @@ impl SnapshotMiddleware for SnapshotRbxmx { mod test { use super::*; - use vfs::{InMemoryFs, VfsSnapshot}; + use memofs::{InMemoryFs, VfsSnapshot}; #[test] fn plain_folder() { diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs index 9ee73b0b..41502d55 100644 --- a/src/snapshot_middleware/txt.rs +++ b/src/snapshot_middleware/txt.rs @@ -1,8 +1,8 @@ use std::{path::Path, str}; use maplit::hashmap; +use memofs::{IoResultExt, Vfs}; use rbx_dom_weak::RbxValue; -use vfs::{IoResultExt, Vfs}; use crate::snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot}; @@ -65,7 +65,7 @@ impl SnapshotMiddleware for SnapshotTxt { mod test { use super::*; - use vfs::{InMemoryFs, VfsSnapshot}; + use memofs::{InMemoryFs, VfsSnapshot}; #[test] fn instance_from_vfs() {