diff --git a/src-tauri/src/core/backup.rs b/src-tauri/src/core/backup.rs index 4a2215ac..dbba01a7 100644 --- a/src-tauri/src/core/backup.rs +++ b/src-tauri/src/core/backup.rs @@ -173,7 +173,7 @@ impl WebDavClient { Ok::, Error>(final_files) }; - Ok(timeout(Duration::from_secs(TIMEOUT_LIST), fut).await??) + timeout(Duration::from_secs(TIMEOUT_LIST), fut).await? } pub async fn delete(&self, file_name: String) -> Result<(), Error> { diff --git a/src-tauri/src/core/tray/speed_rate.rs b/src-tauri/src/core/tray/speed_rate.rs index 447440f4..8f9af419 100644 --- a/src-tauri/src/core/tray/speed_rate.rs +++ b/src-tauri/src/core/tray/speed_rate.rs @@ -66,7 +66,7 @@ impl SpeedRate { // 修改颜色和阴影参数 let text_color = Rgba([255u8, 255u8, 255u8, 255u8]); // 纯白色 let shadow_color = Rgba([0u8, 0u8, 0u8, 180u8]); // 半透明黑色阴影 - let base_size = (height as f32 * 0.5) as f32; + let base_size = height as f32 * 0.5; let scale = Scale::uniform(base_size); let up_text = format_bytes_speed(rate.up); diff --git a/src-tauri/src/feat.rs b/src-tauri/src/feat.rs index d2eb325f..040f1779 100644 --- a/src-tauri/src/feat.rs +++ b/src-tauri/src/feat.rs @@ -475,9 +475,9 @@ pub async fn restore_webdav_backup(filename: String) -> Result<()> { log_err!( patch_verge(IVerge { - webdav_url: webdav_url, - webdav_username: webdav_username, - webdav_password: webdav_password, + webdav_url, + webdav_username, + webdav_password, ..IVerge::default() }) .await diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 62602921..855f7292 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -135,7 +135,6 @@ pub fn run() { tauri::RunEvent::ExitRequested { api, code, .. } => { if code.is_none() { api.prevent_exit(); - return; } } tauri::RunEvent::WindowEvent { label, event, .. } => { diff --git a/src-tauri/src/utils/help.rs b/src-tauri/src/utils/help.rs index 0138631a..04e4bf22 100644 --- a/src-tauri/src/utils/help.rs +++ b/src-tauri/src/utils/help.rs @@ -99,7 +99,7 @@ pub fn get_last_part_and_decode(url: &str) -> Option { /// open file pub fn open_file(_: tauri::AppHandle, path: PathBuf) -> Result<()> { - open::that_detached(&path.as_os_str())?; + open::that_detached(path.as_os_str())?; Ok(()) }