删除未使用代码

itxve · Jan 5, 2023 · 5783310 · 5783310
1 parent c85ec20
commit 5783310
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 31 deletions.
diff --git a/UPDATE_LOG.md b/UPDATE_LOG.md
@@ -1,5 +1,8 @@
 # Updater Log
 
+## v3.0.4
+移出未使用代码
+
 ## v3.0.3
 
 添加自动更新

diff --git a/src-tauri/src/live2d/config.rs b/src-tauri/src/live2d/config.rs
@@ -1,3 +1,5 @@
+#![allow(unused)]
+
 pub const JY_CONFIG_FILE: &'static str = "root_meta_info.json";
 pub const APP_CONFIG_FILE: &'static str = "app.config.json";
 pub const JY_FILE_CHANGE: &'static str = "jy_file_change";
diff --git a/src-tauri/src/live2d/menu.rs b/src-tauri/src/live2d/menu.rs
@@ -1,6 +1,6 @@
 use tauri::{
-    AppHandle, CustomMenuItem, Manager, Menu, SystemTray, SystemTrayEvent, SystemTrayMenu,
-    SystemTrayMenuItem, WindowMenuEvent, Wry,
+    AppHandle, CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu,
+    SystemTrayMenuItem, Wry,
 };
 
 /// system tray

diff --git a/src-tauri/src/live2d/my_command.rs b/src-tauri/src/live2d/my_command.rs
@@ -1,11 +1,5 @@
-use crate::config;
-use crate::live2d::mstruct::{AppDataConfig, InitType, Rt};
-use anyhow::Result;
-use notify::{RecursiveMode, Watcher};
-use std::sync::mpsc::channel;
-use std::{fs, io::Read, path::PathBuf};
-use tauri::updater::UpdateResponse;
-use tauri::{AppHandle, Manager, SystemTrayMenuItem, WindowMenuEvent, Wry};
+use crate::live2d::mstruct::{InitType, Rt};
+use std::fs;
 
 #[tauri::command]
 pub fn read_file(file_path: std::path::PathBuf) -> Rt<Vec<u8>> {

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -2,12 +2,11 @@
     all(not(debug_assertions), target_os = "windows"),
     windows_subsystem = "windows"
 )]
-#![warn(unused_must_use)]
 mod live2d;
 mod plugins;
 
-use live2d::{config, my_command};
-use tauri::{generate_context, Manager};
+use live2d::my_command;
+use tauri::generate_context;
 
 #[tauri::command(main)]
 fn main() {

diff --git a/src-tauri/src/plugins/checkupdate.rs b/src-tauri/src/plugins/checkupdate.rs
@@ -1,10 +1,7 @@
 use anyhow::Result;
+use tauri::plugin::{Builder, TauriPlugin};
 use tauri::updater::UpdateResponse;
-use tauri::{
-    plugin::{Builder, TauriPlugin},
-    Runtime,
-};
-use tauri::{AppHandle, EventLoopMessage, Manager, Wry};
+use tauri::{AppHandle, Manager, Wry};
 
 #[tauri::command]
 pub fn run_check_update(app: AppHandle<Wry>) -> () {
@@ -71,7 +68,7 @@ Release Notes:
 pub fn init() -> TauriPlugin<Wry> {
     Builder::new("checkupdate")
         .invoke_handler(tauri::generate_handler![run_check_update])
-        .setup(move |app| {
+        .setup(move |_app| {
             println!("TauriPlugin [checkupdate] ");
             Ok(())
         })

diff --git a/src-tauri/src/plugins/modelserve.rs b/src-tauri/src/plugins/modelserve.rs
@@ -1,20 +1,14 @@
 use axum::handler::HandlerWithoutStateExt;
-use axum::{
-    http::StatusCode,
-    response::IntoResponse,
-    routing::{get, get_service},
-    Router,
-};
+use axum::{http::StatusCode, response::IntoResponse, routing::get_service, Router};
 
 use axum_server::Handle;
 use std::fs;
 use std::net::SocketAddr;
-use tauri::api::http;
 use tauri::{
     plugin::{Builder, TauriPlugin},
     Runtime,
 };
-use tauri::{window, AppHandle, Manager};
+use tauri::{window, Manager};
 use tower::ServiceExt;
 use tower_http::cors::{Any, CorsLayer};
 use tower_http::{services::ServeDir, trace::TraceLayer};
@@ -62,8 +56,6 @@ pub async fn _serve(serve_dir: &str) {
             .handle_error(handle_error),
         )
     }
-
-    println!("app router:{:?}", &app);
     axum_server::bind(SocketAddr::from(([127, 0, 0, 1], 13004)))
         .handle(handle)
         .serve(
@@ -164,11 +156,11 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
             server_running,
             shutdown_cmd
         ])
-        .setup(move |app| {
+        .setup(move |_app| {
             println!("TauriPlugin [modelserver] ");
             Ok(())
         })
-        .on_page_load(|window, payload| {
+        .on_page_load(|window, _payload| {
             let app_data_path = tauri::api::path::app_config_dir(&window.config()).unwrap();
             let config_path = app_data_path.join(config::APP_CONFIG_FILE);
             if config_path.exists() {