Skip to content

refactor: rename recursive_info to watches in fsevents watcher #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sapphi-red merged 1 commit into from
Dec 19, 2025
Merged

refactor: rename recursive_info to watches in fsevents watcher #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions notify/src/fsevent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ pub struct FsEventWatcher {
flags: fs::FSEventStreamCreateFlags,
event_handler: Arc<Mutex<dyn EventHandler>>,
runloop: Option<(cf::CFRunLoopRef, thread::JoinHandle<()>)>,
recursive_info: HashMap<PathBuf, bool>,
watches: HashMap<PathBuf, bool>,
}

impl fmt::Debug for FsEventWatcher {
Expand All @@ -78,7 +78,7 @@ impl fmt::Debug for FsEventWatcher {
.field("flags", &self.flags)
.field("event_handler", &Arc::as_ptr(&self.event_handler))
.field("runloop", &self.runloop)
.field("recursive_info", &self.recursive_info)
.field("watches", &self.watches)
.finish()
}
}
Expand Down Expand Up @@ -303,7 +303,7 @@ impl FsEventWatcher {
flags: fs::kFSEventStreamCreateFlagFileEvents | fs::kFSEventStreamCreateFlagNoDefer,
event_handler,
runloop: None,
recursive_info: HashMap::new(),
watches: HashMap::new(),
}
}

Expand Down Expand Up @@ -380,7 +380,7 @@ impl FsEventWatcher {
} else {
path.to_owned()
};
match self.recursive_info.remove(&p) {
match self.watches.remove(&p) {
Some(_) => Ok(()),
None => Err(Error::watch_not_found()),
}
Expand Down Expand Up @@ -410,7 +410,7 @@ impl FsEventWatcher {
cf::CFArrayAppendValue(self.paths, cf_path);
cf::CFRelease(cf_path);
}
self.recursive_info
self.watches
.insert(canonical_path, watch_mode.recursive_mode.is_recursive());
Ok(())
}
Expand All @@ -426,7 +426,7 @@ impl FsEventWatcher {
// `FSEventStreamRelease`.
let context = Box::into_raw(Box::new(StreamContextInfo {
event_handler: Arc::clone(&self.event_handler),
recursive_info: self.recursive_info.clone(),
recursive_info: self.watches.clone(),
}));

let stream_context = fs::FSEventStreamContext {
Expand Down