From 9e60b344d06979ade51e49eaa766198e3133b909 Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Wed, 21 Feb 2024 10:45:03 +0400
Subject: [PATCH] Move watcher to utils

---
 src/lib.rs                 | 1 -
 src/main.rs                | 2 +-
 src/utils/mod.rs           | 1 +
 src/{ => utils}/watcher.rs | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename src/{ => utils}/watcher.rs (100%)

diff --git a/src/lib.rs b/src/lib.rs
index b332dc5e..68bcbc36 100644
--- a/src/lib.rs
+++ b/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;
diff --git a/src/main.rs b/src/main.rs
index ce1208c5..5f475993 100644
--- a/src/main.rs
+++ b/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;
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index e273fb72..e83378ae 100644
--- a/src/utils/mod.rs
+++ b/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);
 
diff --git a/src/watcher.rs b/src/utils/watcher.rs
similarity index 100%
rename from src/watcher.rs
rename to src/utils/watcher.rs