cleanup wm_info_provider.rs

Author: MaxVerevkin

src/wm_info_provider.rs

@@ -10,22 +10,13 @@ use crate::protocol::*;
 use crate::state::State;
 
 mod dummy;
-pub use dummy::*;
-
-#[cfg(feature = "river")]
-mod river;
-#[cfg(feature = "river")]
-pub use river::*;
 
 #[cfg(feature = "hyprland")]
 mod hyprland;
-#[cfg(feature = "hyprland")]
-pub use hyprland::*;
-
 #[cfg(feature = "niri")]
 mod niri;
-#[cfg(feature = "niri")]
-pub use niri::*;
+#[cfg(feature = "river")]
+mod river;
 
 pub trait WmInfoProvider: Any {
     fn register(&self, _: &mut EventLoop) {}
@@ -56,21 +47,21 @@ pub trait WmInfoProvider: Any {
 
 pub fn bind(conn: &mut Connection<State>, config: &WmConfig) -> Box<dyn WmInfoProvider> {
     #[cfg(feature = "river")]
-    if let Some(river) = RiverInfoProvider::bind(conn, config) {
+    if let Some(river) = river::RiverInfoProvider::bind(conn, config) {
         return Box::new(river);
     }
 
     #[cfg(feature = "hyprland")]
-    if let Some(hyprland) = HyprlandInfoProvider::new() {
+    if let Some(hyprland) = hyprland::HyprlandInfoProvider::new() {
         return Box::new(hyprland);
     }
 
     #[cfg(feature = "niri")]
-    if let Some(niri) = NiriInfoProvider::new() {
+    if let Some(niri) = niri::NiriInfoProvider::new() {
         return Box::new(niri);
     }
 
-    Box::new(DummyInfoProvider)
+    Box::new(dummy::DummyInfoProvider)
 }
 
 #[derive(Debug)]