Move watcher to utils

src/lib.rs

@@ -20,7 +20,6 @@ pub mod protocols;
 pub mod render_helpers;
 pub mod screenshot_ui;
 pub mod utils;
-pub mod watcher;
 
 #[cfg(not(feature = "xdp-gnome-screencast"))]
 pub mod dummy_pw_utils;

src/main.rs

@@ -16,8 +16,8 @@ use niri::dbus;
 use niri::ipc::client::handle_msg;
 use niri::niri::State;
 use niri::utils::spawning::{spawn, REMOVE_ENV_RUST_BACKTRACE, REMOVE_ENV_RUST_LIB_BACKTRACE};
+use niri::utils::watcher::Watcher;
 use niri::utils::{cause_panic, version, IS_SYSTEMD_SERVICE};
-use niri::watcher::Watcher;
 use niri_config::Config;
 use portable_atomic::Ordering;
 use sd_notify::NotifyState;

src/utils/mod.rs

@@ -15,6 +15,7 @@ use smithay::reexports::rustix::time::{clock_gettime, ClockId};
 use smithay::utils::{Logical, Point, Rectangle, Size};
 
 pub mod spawning;
+pub mod watcher;
 
 pub static IS_SYSTEMD_SERVICE: AtomicBool = AtomicBool::new(false);