diff options
author | Aleksey Kladov <[email protected]> | 2018-12-18 10:35:05 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-12-20 09:15:23 +0000 |
commit | e69b05781f7fb0f0dfdcd4acb433dbcde9cbb7b7 (patch) | |
tree | 3117cbb25cca518646f03e68bd91f7dc36aea571 /crates/ra_vfs/src/lib.rs | |
parent | 99561cf2f20ad572c7149644a70cd7740c0f8b86 (diff) |
add io::Task
Diffstat (limited to 'crates/ra_vfs/src/lib.rs')
-rw-r--r-- | crates/ra_vfs/src/lib.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crates/ra_vfs/src/lib.rs b/crates/ra_vfs/src/lib.rs index d4ba2cb45..8ce6b6ee0 100644 --- a/crates/ra_vfs/src/lib.rs +++ b/crates/ra_vfs/src/lib.rs | |||
@@ -2,8 +2,8 @@ | |||
2 | //! | 2 | //! |
3 | //! When doing analysis, we don't want to do any IO, we want to keep all source | 3 | //! When doing analysis, we don't want to do any IO, we want to keep all source |
4 | //! code in memory. However, the actual source code is stored on disk, so you | 4 | //! code in memory. However, the actual source code is stored on disk, so you |
5 | //! need to get it into the memory in the first place somehow. VFS is the | ||
6 | //! component which does this. | 5 | //! component which does this. |
6 | //! need to get it into the memory in the first place somehow. VFS is the | ||
7 | //! | 7 | //! |
8 | //! It also is responsible for watching the disk for changes, and for merging | 8 | //! It also is responsible for watching the disk for changes, and for merging |
9 | //! editor state (modified, unsaved files) with disk state. | 9 | //! editor state (modified, unsaved files) with disk state. |
@@ -23,11 +23,10 @@ use std::{ | |||
23 | }; | 23 | }; |
24 | 24 | ||
25 | use relative_path::RelativePathBuf; | 25 | use relative_path::RelativePathBuf; |
26 | use thread_worker::{WorkerHandle, Worker}; | 26 | use thread_worker::{WorkerHandle}; |
27 | 27 | ||
28 | use crate::{ | 28 | use crate::{ |
29 | arena::{ArenaId, Arena}, | 29 | arena::{ArenaId, Arena}, |
30 | io::{FileEvent, FsWorker}, | ||
31 | }; | 30 | }; |
32 | 31 | ||
33 | /// `RootFilter` is a predicate that checks if a file can belong to a root. If | 32 | /// `RootFilter` is a predicate that checks if a file can belong to a root. If |
@@ -87,7 +86,7 @@ struct Vfs { | |||
87 | roots: Arena<VfsRoot, RootFilter>, | 86 | roots: Arena<VfsRoot, RootFilter>, |
88 | files: Arena<VfsFile, VfsFileData>, | 87 | files: Arena<VfsFile, VfsFileData>, |
89 | // pending_changes: Vec<PendingChange>, | 88 | // pending_changes: Vec<PendingChange>, |
90 | worker: FsWorker, | 89 | worker: io::Worker, |
91 | worker_handle: WorkerHandle, | 90 | worker_handle: WorkerHandle, |
92 | } | 91 | } |
93 | 92 | ||