first pass of merging in warp (doesn't build)

app/src/antivirus/telemetry.rs

@@ -1,7 +1,6 @@
 use galaxy_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
 use serde_json::{json, Value};
-use strum_macros::EnumDiscriminants;
-use strum_macros::EnumIter;
+use strum_macros::{EnumDiscriminants, EnumIter};
 
 #[derive(Debug, EnumDiscriminants)]
 #[strum_discriminants(derive(EnumIter))]

app/src/antivirus/windows.rs

@@ -1,5 +1,3 @@
-use crate::antivirus::telemetry::AntivirusInfoTelemetryEvent;
-use crate::antivirus::{AntivirusInfo, AntivirusInfoEvent};
 use galaxy_core::send_telemetry_from_ctx;
 use galaxyui::ModelContext;
 use windows::Win32::System::Com::{
@@ -7,6 +5,9 @@ use windows::Win32::System::Com::{
 };
 use windows::Win32::System::SecurityCenter::*;
 
+use crate::antivirus::telemetry::AntivirusInfoTelemetryEvent;
+use crate::antivirus::{AntivirusInfo, AntivirusInfoEvent};
+
 impl AntivirusInfo {
     #[cfg(windows)]
     pub(super) async fn scan() -> anyhow::Result<Option<String>> {