From 4a0869de7b3fb08925460515fdb17a00a117c1f2 Mon Sep 17 00:00:00 2001
From: Evan Almloff <evanalmloff@gmail.com>
Date: Tue, 18 Jul 2023 12:41:48 -0700
Subject: [PATCH] cargo fix

---
 packages/cli/src/builder.rs            |  1 -
 packages/cli/src/cli/serve.rs          |  7 +-----
 packages/cli/src/server/desktop/mod.rs | 35 +++-----------------------
 packages/cli/src/server/mod.rs         | 28 +++------------------
 packages/cli/src/server/web/mod.rs     |  5 +---
 5 files changed, 9 insertions(+), 67 deletions(-)

diff --git a/packages/cli/src/builder.rs b/packages/cli/src/builder.rs
index 0455de93f..c935db106 100644
--- a/packages/cli/src/builder.rs
+++ b/packages/cli/src/builder.rs
@@ -12,7 +12,6 @@ use std::{
     io::Read,
     panic,
     path::PathBuf,
-    process::Command,
     time::Duration,
 };
 use wasm_bindgen_cli_support::Bindgen;
diff --git a/packages/cli/src/cli/serve.rs b/packages/cli/src/cli/serve.rs
index 1be19cb3b..a5d69c7cc 100644
--- a/packages/cli/src/cli/serve.rs
+++ b/packages/cli/src/cli/serve.rs
@@ -1,10 +1,5 @@
 use super::*;
-use std::{
-    fs::create_dir_all,
-    io::Write,
-    path::PathBuf,
-    process::{Command, Stdio},
-};
+use std::{fs::create_dir_all, io::Write, path::PathBuf};
 
 /// Run the WASM project on dev-server
 #[derive(Clone, Debug, Parser)]
diff --git a/packages/cli/src/server/desktop/mod.rs b/packages/cli/src/server/desktop/mod.rs
index bc0d0ef82..93bd4e9e9 100644
--- a/packages/cli/src/server/desktop/mod.rs
+++ b/packages/cli/src/server/desktop/mod.rs
@@ -1,52 +1,25 @@
 use crate::{
-    builder,
-    serve::Serve,
     server::{
-        output::{print_console_info, PrettierOptions, WebServerInfo},
+        output::{print_console_info, PrettierOptions},
         setup_file_watcher, setup_file_watcher_hot_reload,
     },
     BuildResult, CrateConfig, Result,
 };
-use axum::{
-    body::{Full, HttpBody},
-    extract::{ws::Message, Extension, TypedHeader, WebSocketUpgrade},
-    http::{
-        header::{HeaderName, HeaderValue},
-        Method, Response, StatusCode,
-    },
-    response::IntoResponse,
-    routing::{get, get_service},
-    Router,
-};
-use axum_server::tls_rustls::RustlsConfig;
-use cargo_metadata::diagnostic::Diagnostic;
-use dioxus_core::Template;
+
 use dioxus_hot_reload::HotReloadMsg;
 use dioxus_html::HtmlCtx;
 use dioxus_rsx::hot_reload::*;
 use interprocess_docfix::local_socket::LocalSocketListener;
-use notify::{RecommendedWatcher, Watcher};
 use std::{
-    net::UdpSocket,
     path::PathBuf,
-    process::{Child, Command, Stdio},
+    process::{Child, Command},
     sync::{Arc, Mutex, RwLock},
 };
-use tokio::sync::broadcast::{self, Sender};
-use tower::ServiceBuilder;
-use tower_http::services::fs::{ServeDir, ServeFileSystemResponseBody};
-use tower_http::{
-    cors::{Any, CorsLayer},
-    ServiceBuilderExt,
-};
+use tokio::sync::broadcast::{self};
 
 #[cfg(feature = "plugin")]
 use plugin::PluginManager;
 
-struct WsReloadState {
-    update: broadcast::Sender<()>,
-}
-
 pub async fn startup(config: CrateConfig) -> Result<()> {
     // ctrl-c shutdown checker
     let _crate_config = config.clone();
diff --git a/packages/cli/src/server/mod.rs b/packages/cli/src/server/mod.rs
index 8c421f269..19dc44b75 100644
--- a/packages/cli/src/server/mod.rs
+++ b/packages/cli/src/server/mod.rs
@@ -1,37 +1,15 @@
-use crate::{
-    builder, cfg::Platform, serve::Serve, server::desktop::start_desktop, BuildResult, CrateConfig,
-    Result,
-};
-use axum::{
-    body::{Full, HttpBody},
-    extract::{ws::Message, Extension, TypedHeader, WebSocketUpgrade},
-    http::{
-        header::{HeaderName, HeaderValue},
-        Method, Response, StatusCode,
-    },
-    response::IntoResponse,
-    routing::{get, get_service},
-    Router,
-};
-use axum_server::tls_rustls::RustlsConfig;
+use crate::{BuildResult, CrateConfig, Result};
+
 use cargo_metadata::diagnostic::Diagnostic;
 use dioxus_core::Template;
 use dioxus_html::HtmlCtx;
 use dioxus_rsx::hot_reload::*;
 use notify::{RecommendedWatcher, Watcher};
 use std::{
-    net::UdpSocket,
     path::PathBuf,
-    process::{Command, Stdio},
     sync::{Arc, Mutex},
 };
-use tokio::sync::broadcast::{self, Sender};
-use tower::ServiceBuilder;
-use tower_http::services::fs::{ServeDir, ServeFileSystemResponseBody};
-use tower_http::{
-    cors::{Any, CorsLayer},
-    ServiceBuilderExt,
-};
+use tokio::sync::broadcast::Sender;
 
 mod output;
 use output::*;
diff --git a/packages/cli/src/server/web/mod.rs b/packages/cli/src/server/web/mod.rs
index e6a429788..28ffa28c0 100644
--- a/packages/cli/src/server/web/mod.rs
+++ b/packages/cli/src/server/web/mod.rs
@@ -19,14 +19,11 @@ use axum::{
     Router,
 };
 use axum_server::tls_rustls::RustlsConfig;
-use cargo_metadata::diagnostic::Diagnostic;
-use dioxus_core::Template;
+
 use dioxus_html::HtmlCtx;
 use dioxus_rsx::hot_reload::*;
-use notify::{RecommendedWatcher, Watcher};
 use std::{
     net::UdpSocket,
-    path::PathBuf,
     process::Command,
     sync::{Arc, Mutex},
 };