Robot/watchexec
1
0
Fork 0
mirror of https://github.com/watchexec/watchexec.git synced 2024-11-14 00:01:12 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make fs::worker Send

Browse source
This commit is contained in:
Félix Saparelli 2021-08-19 00:40:35 +12:00
parent cae00070fb
commit 826dbd8cda
No known key found for this signature in database
GPG key ID: B948C4BAE44FC474
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/src/fs.rs
View file

@ -29,13 +29,13 @@ impl Default for Watcher {
}
impl Watcher {
fn create(self, f: impl notify::EventFn) -> Result<Box<dyn notify::Watcher>, RuntimeError> {
fn create(self, f: impl notify::EventFn) -> Result<Box<dyn notify::Watcher + Send>, RuntimeError> {
match self {
Self::Native => {
notify::RecommendedWatcher::new(f).map(|w| Box::new(w) as Box<dyn notify::Watcher>)
notify::RecommendedWatcher::new(f).map(|w| Box::new(w) as _)
}
Self::Poll => {
notify::PollWatcher::new(f).map(|w| Box::new(w) as Box<dyn notify::Watcher>)
notify::PollWatcher::new(f).map(|w| Box::new(w) as _)
}
}
.map_err(|err| RuntimeError::FsWatcherCreate { kind: self, err })
@ -90,8 +90,8 @@ pub async fn worker(
debug!("launching filesystem worker");
let mut watcher_type = Watcher::default();
let mut watcher: Option<Box<dyn notify::Watcher>> = None;
let mut pathset: HashSet<PathBuf> = HashSet::new();
let mut watcher = None;
let mut pathset = HashSet::new();
while working.changed().await.is_ok() {
// In separate scope so we drop the working read lock as early as we can
@ -187,6 +187,7 @@ pub async fn worker(
debug!("ending file watcher");
Ok(())
}
fn process_event(
nev: Result<notify::Event, notify::Error>,
kind: Watcher,