diff --git a/src/imfs/event.rs b/src/imfs/event.rs new file mode 100644 index 00000000..357dc0e1 --- /dev/null +++ b/src/imfs/event.rs @@ -0,0 +1,2 @@ +// TODO: Use our own event type instead of notify's. +pub type ImfsEvent = notify::DebouncedEvent; diff --git a/src/imfs/fetcher.rs b/src/imfs/fetcher.rs index ac6ca7ac..61bb544d 100644 --- a/src/imfs/fetcher.rs +++ b/src/imfs/fetcher.rs @@ -5,15 +5,14 @@ use std::{ use crossbeam_channel::Receiver; +use super::event::ImfsEvent; + #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum FileType { File, Directory, } -// TODO: Use our own event type instead of notify's. -pub type ImfsEvent = notify::DebouncedEvent; - /// The generic interface that `Imfs` uses to lazily read files from the disk. /// In tests, it's stubbed out to do different versions of absolutely nothing /// depending on the test. diff --git a/src/imfs/imfs.rs b/src/imfs/imfs.rs index 3798472c..dcfa8d7d 100644 --- a/src/imfs/imfs.rs +++ b/src/imfs/imfs.rs @@ -9,7 +9,8 @@ use crate::path_map::PathMap; use super::{ error::{FsError, FsResult}, - fetcher::{FileType, ImfsEvent, ImfsFetcher}, + event::ImfsEvent, + fetcher::{FileType, ImfsFetcher}, snapshot::ImfsSnapshot, }; @@ -425,7 +426,7 @@ mod test { use crossbeam_channel::Receiver; use maplit::hashmap; - use super::super::{error::FsErrorKind, fetcher::ImfsEvent, noop_fetcher::NoopFetcher}; + use super::super::{error::FsErrorKind, event::ImfsEvent, noop_fetcher::NoopFetcher}; #[test] fn from_snapshot_file() { diff --git a/src/imfs/mod.rs b/src/imfs/mod.rs index 5b403013..e930e089 100644 --- a/src/imfs/mod.rs +++ b/src/imfs/mod.rs @@ -1,4 +1,5 @@ mod error; +mod event; mod fetcher; mod imfs; mod noop_fetcher; @@ -6,6 +7,7 @@ mod real_fetcher; mod snapshot; pub use error::*; +pub use event::*; pub use fetcher::*; pub use imfs::*; pub use noop_fetcher::*; diff --git a/src/imfs/noop_fetcher.rs b/src/imfs/noop_fetcher.rs index be97aa68..cf3ed829 100644 --- a/src/imfs/noop_fetcher.rs +++ b/src/imfs/noop_fetcher.rs @@ -11,7 +11,10 @@ use std::{ use crossbeam_channel::Receiver; -use super::fetcher::{FileType, ImfsEvent, ImfsFetcher}; +use super::{ + event::ImfsEvent, + fetcher::{FileType, ImfsFetcher}, +}; pub struct NoopFetcher; diff --git a/src/imfs/real_fetcher.rs b/src/imfs/real_fetcher.rs index e9dc221a..4d5a68b9 100644 --- a/src/imfs/real_fetcher.rs +++ b/src/imfs/real_fetcher.rs @@ -13,7 +13,10 @@ use crossbeam_channel::{unbounded, Receiver}; use jod_thread::JoinHandle; use notify::{RecommendedWatcher, RecursiveMode, Watcher}; -use super::fetcher::{FileType, ImfsEvent, ImfsFetcher}; +use super::{ + event::ImfsEvent, + fetcher::{FileType, ImfsFetcher}, +}; /// Workaround to disable the file watcher for processes that don't need it, /// since notify appears hang on to mpsc Sender objects too long, causing Rojo