move debouncer to own crate and fix audit failures

.github/workflows/main.yml

@@ -53,13 +53,14 @@ jobs:
         if: matrix.version == '1.56.0' && matrix.os != 'macos-latest'
         run: cargo check --features=serde
 
-      - name: check build example
+      - name: check build examples
         if: matrix.version == 'stable'
-        run: cargo check -p watcher_kind
+        run: cargo check --package examples --examples
 
       - name: test hot_reload_tide
         if: matrix.version == 'stable'
-        run: cargo test -p hot_reload_tide
+        run: cargo test
+        working-directory: examples/hot_reload_tide
 
       - name: test
         if: matrix.version == 'stable'

Cargo.toml

@@ -1,69 +1,16 @@
-[package]
-name = "notify"
-version = "5.0.0-pre.15"
-rust-version = "1.56"
-description = "Cross-platform filesystem notification library"
-documentation = "https://docs.rs/notify"
-homepage = "https://github.com/notify-rs/notify"
-repository = "https://github.com/notify-rs/notify.git"
-readme = "README.md"
-license = "CC0-1.0 OR Artistic-2.0"
-keywords = ["events", "filesystem", "notify", "watch"]
-categories = ["filesystem"]
-authors = [
-  "Félix Saparelli <[email protected]>",
-  "Daniel Faust <[email protected]>"
-]
+[workspace]
 
-edition = "2021"
-exclude = [
-  "/clippy.toml",
-  ".github/*"
+members = [
+  "notify",
+  "notify-debouncer-mini",
+
+  # internal
+  "examples"
+  #"examples/hot_reload_tide" untill https://github.com/rustsec/rustsec/issues/501 is resolved
 ]
 
-[dependencies]
-bitflags = "1.0.4"
-crossbeam-channel = "0.5.0"
-filetime = "0.2.6"
-libc = "0.2.4"
-serde = { version = "1.0.89", features = ["derive"], optional = true }
-walkdir = "2.0.1"
-
-[target.'cfg(target_os="linux")'.dependencies]
-inotify = { version = "0.9", default-features = false }
-mio = { version = "0.8", features = ["os-ext"] }
-
-[target.'cfg(target_os="macos")'.dependencies]
-fsevent-sys = { version = "4", optional = true }
-kqueue = { version = "1.0", optional = true }
-mio = { version = "0.8", features = ["os-ext"], optional = true }
-
-[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.8", features = ["fileapi", "handleapi", "ioapiset", "minwinbase", "synchapi", "winbase", "winnt"] }
-
-[target.'cfg(any(target_os="freebsd", target_os="openbsd", target_os = "netbsd", target_os = "dragonflybsd"))'.dependencies]
-kqueue = "^1.0.4" # fix for #344
-mio = { version = "0.8", features = ["os-ext"] }
-
-[dev-dependencies]
-futures = "0.3"
-serde_json = "1.0.39"
-tempfile = "3.2.0"
-nix = "0.23.1"
-
-[features]
-default = ["macos_fsevent"]
-timing_tests = []
-manual_tests = []
-macos_kqueue = ["kqueue", "mio"]
-macos_fsevent = ["fsevent-sys"]
+exclude = ["examples/hot_reload_tide"]
 
 [patch.crates-io]
-notify = { path = "." }
-
-[workspace]
-members = [
-  ".",
-  "examples/hot_reload_tide",
-  "examples/watcher_kind"
-]
+notify = { path = "notify/" }
+notify-debouncer-mini = { path = "notify-debouncer-mini/" }

examples/Cargo.toml

@@ -0,0 +1,35 @@
+[package]
+name = "examples"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[dev-dependencies]
+notify = { version = "5.0.0-pre.15" }
+notify-debouncer-mini = { version = "0.1" }
+futures = "0.3"
+
+[[example]]
+name = "async_monitor"
+path = "async_monitor.rs"
+
+[[example]]
+name = "monitor_raw"
+path = "monitor_raw.rs"
+
+[[example]]
+name = "debounced"
+path = "debounced.rs"
+
+[[example]]
+name = "poll_sysfs"
+path = "poll_sysfs.rs"
+
+[[example]]
+name = "watcher_kind"
+path = "watcher_kind.rs"
+
+# specifically in its own sub folder
+# to prevent audit from complaining
+#[[example]]
+#name = "hot_reload_tide"

examples/debounced.rs

@@ -1,6 +1,7 @@
 use std::{path::Path, time::Duration};
 
-use notify::{new_debouncer, RecursiveMode, Watcher};
+use notify::{RecursiveMode, Watcher};
+use notify_debouncer_mini::new_debouncer;
 
 fn main() {
     std::thread::spawn(|| {

examples/hot_reload_tide/Cargo.toml

@@ -11,4 +11,6 @@ tide = "0.16.0"
 async-std = { version = "1.6.0", features = ["attributes"] }
 serde_json = "1.0"
 serde = "1.0.115"
-notify = { version = "5.0.0-pre.15", features = ["serde"] }
+notify = { version = "5.0.0-pre.15", features = ["serde"], path = "../../notify" }
+
+[workspace]

examples/hot_reload_tide/tests/messages_test.rs

@@ -1,4 +1,4 @@
-use hot_reload_tide::messages::{Config, load_config};
+use hot_reload_tide::messages::{load_config, Config};
 
 #[test]
 fn load_config_from_file() {

examples/watcher_kind/src/main.rs → examples/watcher_kind.rs

@@ -12,4 +12,5 @@ fn main() {
     } else {
         Box::new(RecommendedWatcher::new(tx).unwrap())
     };
+    // use _watcher here
 }

notify-debouncer-mini/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "notify-debouncer-mini"
+version = "0.1.0"
+edition = "2021"
+description = "notify mini debouncer for events"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+name = "notify_debouncer_mini"
+path = "src/lib.rs"
+
+[dependencies]
+notify = "5.0.0-pre.15"

src/debouncer.rs → notify-debouncer-mini/src/lib.rs

@@ -11,7 +11,7 @@ use std::{
     time::{Duration, Instant},
 };
 
-use crate::{Error, ErrorKind, Event, RecommendedWatcher, Watcher};
+use notify::{Error, ErrorKind, Event, RecommendedWatcher, Watcher};
 
 /// Deduplicate event data entry
 struct EventData {

notify/.gitignore

@@ -0,0 +1,6 @@
+/target
+/Cargo.lock
+.*.sw*
+tests/last-fails
+tests/last-run.log
+.cargo

notify/Cargo.toml

@@ -0,0 +1,54 @@
+[package]
+name = "notify"
+version = "5.0.0-pre.15"
+rust-version = "1.56"
+description = "Cross-platform filesystem notification library"
+documentation = "https://docs.rs/notify"
+homepage = "https://github.com/notify-rs/notify"
+repository = "https://github.com/notify-rs/notify.git"
+readme = "README.md"
+license = "CC0-1.0 OR Artistic-2.0"
+keywords = ["events", "filesystem", "notify", "watch"]
+categories = ["filesystem"]
+authors = [
+  "Félix Saparelli <[email protected]>",
+  "Daniel Faust <[email protected]>"
+]
+
+edition = "2021"
+
+[dependencies]
+bitflags = "1.0.4"
+crossbeam-channel = "0.5.0"
+filetime = "0.2.6"
+libc = "0.2.4"
+serde = { version = "1.0.89", features = ["derive"], optional = true }
+walkdir = "2.0.1"
+
+[target.'cfg(target_os="linux")'.dependencies]
+inotify = { version = "0.9", default-features = false }
+mio = { version = "0.8", features = ["os-ext"] }
+
+[target.'cfg(target_os="macos")'.dependencies]
+fsevent-sys = { version = "4", optional = true }
+kqueue = { version = "1.0", optional = true }
+mio = { version = "0.8", features = ["os-ext"], optional = true }
+
+[target.'cfg(windows)'.dependencies]
+winapi = { version = "0.3.8", features = ["fileapi", "handleapi", "ioapiset", "minwinbase", "synchapi", "winbase", "winnt"] }
+
+[target.'cfg(any(target_os="freebsd", target_os="openbsd", target_os = "netbsd", target_os = "dragonflybsd"))'.dependencies]
+kqueue = "^1.0.4" # fix for #344
+mio = { version = "0.8", features = ["os-ext"] }
+
+[dev-dependencies]
+serde_json = "1.0.39"
+tempfile = "3.2.0"
+nix = "0.23.1"
+
+[features]
+default = ["macos_fsevent"]
+timing_tests = []
+manual_tests = []
+macos_kqueue = ["kqueue", "mio"]
+macos_fsevent = ["fsevent-sys"]

src/lib.rs → notify/src/lib.rs

@@ -101,7 +101,6 @@
 #![deny(missing_docs)]
 
 pub use config::{Config, RecursiveMode};
-pub use debouncer::new_debouncer;
 pub use error::{Error, ErrorKind, Result};
 pub use event::{Event, EventKind};
 use std::path::Path;
@@ -143,7 +142,6 @@ pub mod null;
 pub mod poll;
 
 mod config;
-mod debouncer;
 mod error;
 
 /// The set of requirements for watcher event handling functions.

src/poll.rs → notify/src/poll.rs

@@ -470,7 +470,6 @@ impl PollWatcher {
                     {
                         data_builder.update_timestamp();
 
-
                         let vals = watches.values_mut();
                         for watch_data in vals {
                             watch_data.rescan(&mut data_builder);

release_checklist.md

@@ -1,6 +1,10 @@
+# Release checklist of files to update
 
-- update changelog
-- update readme
-- update lib.rs
-- update cargo.toml
+Specifically the notify version.
+
+- update CHANGELOG.md
+- update README.md
+- update notify/lib.rs
+- update notify/cargo.toml examples/Cargo.toml examples/hot_reload_tide/Cargo.toml
   - bump version number on the root Cargo.toml and examples
+- maybe update notify-debouncer-mini/Cargo.toml