Use core-foundation

Cargo.toml

@@ -10,8 +10,9 @@ edition = "2018"
 
 [dependencies]
 bitflags = "1"
-fsevent-sys = "4.0.0"
-# fsevent-sys = { path = "fsevent-sys" }
+# fsevent-sys = "5.0.0"
+fsevent-sys = { path = "fsevent-sys" }
+core-foundation = "0.9.4"
 
 [dev-dependencies]
 tempfile = "3"

examples/fsevent-async-demo.rs

@@ -1,12 +1,9 @@
-extern crate fsevent;
+use std::{sync::mpsc::channel, thread};
 
-use std::sync::mpsc::channel;
-use std::thread;
-
-#[cfg(not(target_os="macos"))]
+#[cfg(not(target_os = "macos"))]
 fn main() {}
 
-#[cfg(target_os="macos")]
+#[cfg(target_os = "macos")]
 fn main() {
     let (sender, receiver) = channel();
 
@@ -24,7 +21,7 @@ fn main() {
             Err(e) => match e {
                 std::sync::mpsc::RecvTimeoutError::Disconnected => break,
                 _ => {} // This is the case where nothing entered the channel buffer (no file mods).
-            }
+            },
         }
     }
 

examples/fsevent-demo.rs

@@ -1,11 +1,9 @@
-extern crate fsevent;
-use std::sync::mpsc::channel;
-use std::thread;
+use std::{sync::mpsc::channel, thread};
 
-#[cfg(not(target_os="macos"))]
+#[cfg(not(target_os = "macos"))]
 fn main() {}
 
-#[cfg(target_os="macos")]
+#[cfg(target_os = "macos")]
 fn main() {
     let (sender, receiver) = channel();
 

fsevent-sys/Cargo.toml

@@ -1,14 +1,18 @@
 [package]
 name = "fsevent-sys"
-version = "4.1.0"
+version = "5.0.0"
 authors = ["Pierre Baillet <pierre@baillet.name>"]
 description = "Rust bindings to the fsevent macOS API for file changes notifications"
 license = "MIT"
 repository = "https://github.com/octplane/fsevent-rust/tree/master/fsevent-sys"
 edition = "2018"
 
 [dependencies]
-libc = "0.2.68"
+dispatch2 = { version = "0.2.0", default-features = false, features = ["alloc"] }
+core-foundation = "0.9.2"
 
 [package.metadata.docs.rs]
-targets = ["x86_64-apple-darwin"]
+targets = [
+    "x86_64-apple-darwin",
+    "aarch64-apple-darwin",
+]

fsevent-sys/src/fsevent.rs

@@ -1,12 +1,21 @@
 #![allow(non_upper_case_globals, non_camel_case_types)]
 
-use crate::core_foundation::{
-    Boolean, CFAbsoluteTime, CFAllocatorCopyDescriptionCallBack, CFAllocatorRef,
-    CFAllocatorReleaseCallBack, CFAllocatorRetainCallBack, CFArrayRef, CFIndex, CFRunLoopRef,
-    CFStringRef, CFTimeInterval,
+use core_foundation::{
+    array::{CFArrayRef, CFIndex},
+    base::{
+        Boolean, CFAllocatorCopyDescriptionCallBack, CFAllocatorReleaseCallBack,
+        CFAllocatorRetainCallBack,
+    },
+    date::{CFAbsoluteTime, CFTimeInterval},
+    mach_port::CFAllocatorRef,
+    runloop::CFRunLoopRef,
+    string::CFStringRef,
+};
+use dispatch2::ffi::dispatch_queue_t;
+use std::os::{
+    raw::{c_uint, c_void},
+    unix::raw::dev_t,
 };
-use libc::dev_t;
-use std::os::raw::{c_uint, c_void};
 
 pub type FSEventStreamRef = *mut c_void;
 pub type ConstFSEventStreamRef = *const c_void;
@@ -74,7 +83,7 @@ pub struct FSEventStreamContext {
 
 // https://developer.apple.com/documentation/coreservices/file_system_events
 #[link(name = "CoreServices", kind = "framework")]
-extern "C" {
+unsafe extern "C" {
     pub fn FSEventStreamCopyDescription(stream_ref: ConstFSEventStreamRef) -> CFStringRef;
     pub fn FSEventStreamCopyPathsBeingWatched(streamRef: ConstFSEventStreamRef) -> CFArrayRef;
     pub fn FSEventStreamCreate(
@@ -109,7 +118,7 @@ extern "C" {
         run_loop: CFRunLoopRef,
         run_loop_mode: CFStringRef,
     );
-    // pub fn FSEventStreamSetDispatchQueue(streamRef: FSEventStreamRef, q: DispatchQueue);
+    pub fn FSEventStreamSetDispatchQueue(stream_ref: FSEventStreamRef, q: dispatch_queue_t);
     pub fn FSEventStreamSetExclusionPaths(
         stream_ref: FSEventStreamRef,
         paths_to_exclude: CFArrayRef,

fsevent-sys/src/lib.rs

@@ -1,7 +1,4 @@
 #![cfg(target_os = "macos")]
-#![cfg_attr(feature = "cargo-clippy", allow(unreadable_literal))]
 
-pub mod core_foundation;
 mod fsevent;
-
 pub use fsevent::*;