Refactor main_loop

This commit is contained in:
Aleksey Kladov 2020-06-25 17:14:11 +02:00
parent dd20c2ec5b
commit 379a096de9
4 changed files with 406 additions and 418 deletions

View file

@ -82,7 +82,12 @@ impl NotifyActor {
watcher_receiver,
}
}
fn next_event(&self, receiver: &Receiver<Message>) -> Option<Event> {
select! {
recv(receiver) -> it => it.ok().map(Event::Message),
recv(&self.watcher_receiver) -> it => Some(Event::NotifyEvent(it.unwrap())),
}
}
fn run(mut self, inbox: Receiver<Message>) {
while let Some(event) = self.next_event(&inbox) {
log::debug!("vfs-notify event: {:?}", event);
@ -154,12 +159,6 @@ impl NotifyActor {
}
}
}
fn next_event(&self, receiver: &Receiver<Message>) -> Option<Event> {
select! {
recv(receiver) -> it => it.ok().map(Event::Message),
recv(&self.watcher_receiver) -> it => Some(Event::NotifyEvent(it.unwrap())),
}
}
fn load_entry(
&mut self,
entry: loader::Entry,