nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add type alias

Browse Source
This commit is contained in:
Aleksey Kladov 2018-12-18 13:23:23 +03:00
parent 2ae05a6163
commit 99561cf2f2
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ra_vfs/src/io.rs
View File

@ -19,7 +19,9 @@ pub enum FileEventKind {
Add(String),
}
pub fn start() -> (Worker<PathBuf, (PathBuf, Vec<FileEvent>)>, WorkerHandle) {
pub(crate) type FsWorker = Worker<PathBuf, (PathBuf, Vec<FileEvent>)>;
pub(crate) fn start() -> (FsWorker, WorkerHandle) {
thread_worker::spawn::<PathBuf, (PathBuf, Vec<FileEvent>), _>(
"vfs",
128,

8
crates/ra_vfs/src/lib.rs
View File

@ -27,10 +27,11 @@ use thread_worker::{WorkerHandle, Worker};
use crate::{
arena::{ArenaId, Arena},
io::FileEvent,
io::{FileEvent, FsWorker},
};
/// `RootFilter` is a predicate that checks if a file can belong to a root
/// `RootFilter` is a predicate that checks if a file can belong to a root. If
/// several filters match a file (nested dirs), the most nested one wins.
struct RootFilter {
root: PathBuf,
file_filter: fn(&Path) -> bool,
@ -86,7 +87,7 @@ struct Vfs {
roots: Arena<VfsRoot, RootFilter>,
files: Arena<VfsFile, VfsFileData>,
// pending_changes: Vec<PendingChange>,
worker: Worker<PathBuf, (PathBuf, Vec<FileEvent>)>,
worker: FsWorker,
worker_handle: WorkerHandle,
}
@ -101,6 +102,7 @@ impl Vfs {
worker_handle,
};
// A hack to make nesting work.
roots.sort_by_key(|it| Reverse(it.as_os_str().len()));
for path in roots {