Batch rename: imfs -> vfs

This commit is contained in:
Lucien Greathouse
2019-10-12 13:58:00 -07:00
parent 24c697bea7
commit 1031600c63
40 changed files with 539 additions and 545 deletions

View File

@@ -8,8 +8,8 @@ use failure::Fail;
use crate::{
common_setup,
imfs::{FsError, Imfs, RealFetcher, WatchMode},
project::ProjectLoadError,
vfs::{FsError, RealFetcher, Vfs, WatchMode},
};
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -81,9 +81,9 @@ pub fn build(options: &BuildOptions) -> Result<(), BuildError> {
log::debug!("Hoping to generate file of type {:?}", output_kind);
log::trace!("Constructing in-memory filesystem");
let mut imfs = Imfs::new(RealFetcher::new(WatchMode::Disabled));
let mut vfs = Vfs::new(RealFetcher::new(WatchMode::Disabled));
let (_maybe_project, tree) = common_setup::start(&options.fuzzy_project_path, &mut imfs);
let (_maybe_project, tree) = common_setup::start(&options.fuzzy_project_path, &mut vfs);
let root_id = tree.get_root_id();
log::trace!("Opening output file for write");

View File

@@ -8,9 +8,9 @@ use failure::Fail;
use termcolor::{BufferWriter, Color, ColorChoice, ColorSpec, WriteColor};
use crate::{
imfs::{Imfs, RealFetcher, WatchMode},
project::ProjectLoadError,
serve_session::ServeSession,
vfs::{RealFetcher, Vfs, WatchMode},
web::LiveServer,
};
@@ -33,9 +33,9 @@ impl_from!(ServeError {
});
pub fn serve(options: &ServeOptions) -> Result<(), ServeError> {
let imfs = Imfs::new(RealFetcher::new(WatchMode::Enabled));
let vfs = Vfs::new(RealFetcher::new(WatchMode::Enabled));
let session = Arc::new(ServeSession::new(imfs, &options.fuzzy_project_path));
let session = Arc::new(ServeSession::new(vfs, &options.fuzzy_project_path));
let port = options
.port

View File

@@ -6,7 +6,7 @@ use reqwest::header::{ACCEPT, CONTENT_TYPE, COOKIE, USER_AGENT};
use crate::{
auth_cookie::get_auth_cookie,
common_setup,
imfs::{Imfs, RealFetcher, WatchMode},
vfs::{RealFetcher, Vfs, WatchMode},
};
#[derive(Debug, Fail)]
@@ -44,9 +44,9 @@ pub fn upload(options: UploadOptions) -> Result<(), UploadError> {
.ok_or(UploadError::NeedAuthCookie)?;
log::trace!("Constructing in-memory filesystem");
let mut imfs = Imfs::new(RealFetcher::new(WatchMode::Disabled));
let mut vfs = Vfs::new(RealFetcher::new(WatchMode::Disabled));
let (_maybe_project, tree) = common_setup::start(&options.fuzzy_project_path, &mut imfs);
let (_maybe_project, tree) = common_setup::start(&options.fuzzy_project_path, &mut vfs);
let root_id = tree.get_root_id();
let mut buffer = Vec::new();