From f9ad90d01590323987b6d79341106ef635a44cb6 Mon Sep 17 00:00:00 2001
From: rzuasti <rzuasti@pm.me>
Date: Sat, 30 May 2026 09:52:40 -0400
Subject: [PATCH] Drop redundant `use ... as ...` aliases in scanner imports

The aliases re-encoded the module path into a name that no longer
matched the source identifier (e.g. `use super::finder as mdns`). Use
the actual module names at call sites; in the two web_server handlers
the local `status` fn collides with the module, so the single call site
uses the fully-qualified path instead.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 backend/src/scanners/arp/scanner.rs    |  6 +++---
 backend/src/scanners/mdns/scanner.rs   | 12 ++++++------
 backend/src/web_server/arp_scanner.rs  |  4 +---
 backend/src/web_server/mdns_scanner.rs |  4 +---
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/backend/src/scanners/arp/scanner.rs b/backend/src/scanners/arp/scanner.rs
index 430efaf..eb83da0 100644
--- a/backend/src/scanners/arp/scanner.rs
+++ b/backend/src/scanners/arp/scanner.rs
@@ -1,5 +1,5 @@
 use super::finder;
-use super::status as arp_scanner_status;
+use super::status;
 use crate::db;
 use crate::events;
 use crate::settings::get_settings;
@@ -9,7 +9,7 @@ use tokio::time::{Duration, sleep};
 
 pub async fn scan() -> Result<(), Box<dyn std::error::Error>> {
     loop {
-        arp_scanner_status::set_running();
+        status::set_running();
 
         // Find online devices via ARP
         let devices = finder::find(get_settings().networking.interface.clone()).await?;
@@ -59,7 +59,7 @@ pub async fn scan() -> Result<(), Box<dyn std::error::Error>> {
             "Scan finished. Sleeping for {}",
             get_settings().arp_scanner.wait_between_scans
         );
-        arp_scanner_status::set_waiting(next_scan_at);
+        status::set_waiting(next_scan_at);
         sleep(wait).await;
     }
 }
diff --git a/backend/src/scanners/mdns/scanner.rs b/backend/src/scanners/mdns/scanner.rs
index d5450a8..9ba815c 100644
--- a/backend/src/scanners/mdns/scanner.rs
+++ b/backend/src/scanners/mdns/scanner.rs
@@ -4,8 +4,8 @@ use std::time::Duration;
 use chrono::Local;
 use log::{debug, error, info, warn};
 
-use super::finder as mdns;
-use super::status as mdns_scanner_status;
+use super::finder;
+use super::status;
 use crate::data::mac_vendor_finder;
 use crate::data::vendor_device_type_finder;
 use crate::db;
@@ -17,8 +17,8 @@ use crate::settings::get_settings;
 /// pipeline used by the ARP scanner (devices table + events + notifications).
 pub async fn listen() -> Result<(), Box<dyn std::error::Error>> {
     let interface = get_settings().networking.interface.clone();
-    let socket = mdns::open_socket(interface.clone())?;
-    mdns_scanner_status::set_listening();
+    let socket = finder::open_socket(interface.clone())?;
+    status::set_listening();
     info!("mDNS scanner listening for announcements");
 
     let probe_timeout = Duration::from(get_settings().mdns_scanner.probe_timeout);
@@ -38,7 +38,7 @@ pub async fn listen() -> Result<(), Box<dyn std::error::Error>> {
             IpAddr::V6(_) => continue, // the device model is IPv4-only
         };
 
-        let announcement = mdns::parse_announcement(&buf[..len]);
+        let announcement = finder::parse_announcement(&buf[..len]);
         let hostname = match announcement.hostnames.into_iter().next() {
             Some(host) => host,
             None => continue,
@@ -117,5 +117,5 @@ async fn process_announcement(
         }
     }
 
-    mdns_scanner_status::record_discovery();
+    status::record_discovery();
 }
diff --git a/backend/src/web_server/arp_scanner.rs b/backend/src/web_server/arp_scanner.rs
index 1dcb92e..2fae12f 100644
--- a/backend/src/web_server/arp_scanner.rs
+++ b/backend/src/web_server/arp_scanner.rs
@@ -4,8 +4,6 @@ use log::error;
 use serde::Serialize;
 use utoipa::ToSchema;
 
-use crate::scanners::arp::status as arp_scanner_status;
-
 #[derive(Serialize, ToSchema)]
 pub struct ArpScannerStatusResponse {
     pub is_running: bool,
@@ -26,7 +24,7 @@ pub struct ArpScannerStatusResponse {
     security(("bearer_auth" = []))
 )]
 pub async fn status() -> Result<Json<ArpScannerStatusResponse>, StatusCode> {
-    let snapshot = match arp_scanner_status::get() {
+    let snapshot = match crate::scanners::arp::status::get() {
         Some(s) => s,
         None => {
             error!("ARP scanner status not initialized");
diff --git a/backend/src/web_server/mdns_scanner.rs b/backend/src/web_server/mdns_scanner.rs
index 9d55e22..fc78e38 100644
--- a/backend/src/web_server/mdns_scanner.rs
+++ b/backend/src/web_server/mdns_scanner.rs
@@ -4,8 +4,6 @@ use log::error;
 use serde::Serialize;
 use utoipa::ToSchema;
 
-use crate::scanners::mdns::status as mdns_scanner_status;
-
 #[derive(Serialize, ToSchema)]
 pub struct MdnsScannerStatusResponse {
     pub is_listening: bool,
@@ -28,7 +26,7 @@ pub struct MdnsScannerStatusResponse {
     security(("bearer_auth" = []))
 )]
 pub async fn status() -> Result<Json<MdnsScannerStatusResponse>, StatusCode> {
-    let snapshot = match mdns_scanner_status::get() {
+    let snapshot = match crate::scanners::mdns::status::get() {
         Some(s) => s,
         None => {
             error!("mDNS scanner status not initialized");