Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-27 12:25:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid the overhead of select! when possible

Browse source
This commit is contained in:
mo8it 2024-08-10 02:12:09 +02:00
parent 9731fa9fe0
commit d30711ae73
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/vfs-notify/src/lib.rs
View file

@ -13,7 +13,7 @@ use std::{
sync::atomic::AtomicUsize, sync::atomic::AtomicUsize,
}; };
use crossbeam_channel::{never, select, unbounded, Receiver, Sender}; use crossbeam_channel::{select, unbounded, Receiver, Sender};
use notify::{Config, EventKind, RecommendedWatcher, RecursiveMode, Watcher}; use notify::{Config, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
use paths::{AbsPath, AbsPathBuf, Utf8PathBuf}; use paths::{AbsPath, AbsPathBuf, Utf8PathBuf};
use rayon::iter::{IndexedParallelIterator as _, IntoParallelIterator as _, ParallelIterator}; use rayon::iter::{IndexedParallelIterator as _, IntoParallelIterator as _, ParallelIterator};
@ -85,10 +85,13 @@ impl NotifyActor {
} }
fn next_event(&self, receiver: &Receiver<Message>) -> Option<Event> { fn next_event(&self, receiver: &Receiver<Message>) -> Option<Event> {
let watcher_receiver = self.watcher.as_ref().map(|(_, receiver)| receiver); let Some((_, watcher_receiver)) = &self.watcher else {
return receiver.recv().ok().map(Event::Message);
};
select! { select! {
recv(receiver) -> it => it.ok().map(Event::Message), recv(receiver) -> it => it.ok().map(Event::Message),
recv(watcher_receiver.unwrap_or(&never())) -> it => Some(Event::NotifyEvent(it.unwrap())), recv(watcher_receiver) -> it => Some(Event::NotifyEvent(it.unwrap())),
} }
} }