diff --git a/windSend-rs/Cargo.lock b/windSend-rs/Cargo.lock index 6b0a47f65..9773ef2ba 100644 --- a/windSend-rs/Cargo.lock +++ b/windSend-rs/Cargo.lock @@ -152,9 +152,9 @@ checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" [[package]] name = "arboard" -version = "3.5.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1df21f715862ede32a0c525ce2ca4d52626bb0007f8c18b87a384503ac33e70" +checksum = "55f533f8e0af236ffe5eb979b99381df3258853f00ba2e44b6e1955292c75227" dependencies = [ "clipboard-win", "image", @@ -456,9 +456,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" dependencies = [ "addr2line", "cfg-if", @@ -720,9 +720,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", @@ -789,9 +789,9 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" +checksum = "ad36507aeb7e16159dfe68db81ccc27571c3ccd4b76fb2fb72fc59e7a4b1b64c" dependencies = [ "bitflags 2.9.0", "block", @@ -2651,9 +2651,9 @@ dependencies = [ [[package]] name = "muda" -version = "0.16.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de14a9b5d569ca68d7c891d613b390cf5ab4f851c77aaa2f9e435555d3d9492" +checksum = "58b89bf91c19bf036347f1ab85a81c560f08c0667c8601bece664d860a600988" dependencies = [ "crossbeam-channel", "dpi", @@ -4233,9 +4233,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", @@ -4332,9 +4332,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4450,9 +4450,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e59c1f38e657351a2e822eadf40d6a2ad4627b9c25557bc1180ec1b3295ef82" +checksum = "49c380ca75a231b87b6c9dd86948f035012e7171d1a7c40a9c2890489a7ffd8a" dependencies = [ "bitflags 2.9.0", "core-foundation 0.10.0", @@ -4660,9 +4660,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.44.2" +version = "1.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" +checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" dependencies = [ "backtrace", "bytes", @@ -4879,9 +4879,9 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7eee98ec5c90daf179d55c20a49d8c0d043054ce7c26336c09a24d31f14fa0" +checksum = "2da75ec677957aa21f6e0b361df0daab972f13a5bee3606de0638fd4ee1c666a" dependencies = [ "crossbeam-channel", "dirs", @@ -5152,9 +5152,9 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7208998eaa3870dad37ec8836979581506e0c5c64c20c9e79e9d2a10d6f47bf" +checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121" dependencies = [ "cc", "downcast-rs", @@ -5166,9 +5166,9 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.8" +version = "0.31.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2120de3d33638aaef5b9f4472bff75f07c56379cf76ea320bd3a3d65ecaf73f" +checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61" dependencies = [ "bitflags 2.9.0", "rustix 0.38.44", @@ -5200,9 +5200,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.32.6" +version = "0.32.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0781cf46869b37e36928f7b432273c0995aa8aed9552c556fb18754420541efc" +checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a" dependencies = [ "bitflags 2.9.0", "wayland-backend", @@ -5212,9 +5212,9 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccaacc76703fefd6763022ac565b590fcade92202492381c95b2edfdf7d46b3" +checksum = "4fd38cdad69b56ace413c6bcc1fbf5acc5e2ef4af9d5f8f1f9570c0c83eae175" dependencies = [ "bitflags 2.9.0", "wayland-backend", @@ -5849,9 +5849,9 @@ dependencies = [ [[package]] name = "winit" -version = "0.30.9" +version = "0.30.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a809eacf18c8eca8b6635091543f02a5a06ddf3dad846398795460e6e0ae3cc0" +checksum = "a4409c10174df8779dc29a4788cac85ed84024ccbc1743b776b21a520ee1aaf4" dependencies = [ "ahash", "android-activity", diff --git a/windSend-rs/Cargo.toml b/windSend-rs/Cargo.toml index e6bfc12cd..ae89d7deb 100644 --- a/windSend-rs/Cargo.toml +++ b/windSend-rs/Cargo.toml @@ -15,7 +15,7 @@ disable-systray-support = [] log = "0.4" aes = "0.8.3" hex = "0.4.3" -tokio = { version = "1.44", features = ["full"] } +tokio = { version = "1.45", features = ["full"] } # x25519 依赖rand v0.8 rand = "0.8" x25519-dalek = "2.0" @@ -42,14 +42,14 @@ tracing-subscriber = { version = "0.3", features = [ "local-time", ] } tracing-appender = "0.2" -sha2 = "0.10.8" +sha2 = "0.10.9" anyhow = "1.0" cbc = "0.1.2" cipher = "0.4" -chrono = "0.4.31" +chrono = "0.4.41" subslice = "0.2.3" regex = "1.11" -arboard = { version = "3.5", features = [ +arboard = { version = "3.6", features = [ "core-graphics", "image", "image-data", @@ -91,8 +91,8 @@ urlencoding = "2.1.3" openssl = { version = "*", features = ["vendored"] } [target.'cfg(not(all(target_os = "linux", target_env = "musl")))'.dependencies] -tao = "0.33" -tray-icon = "0.20" +tao = "0.34" +tray-icon = "0.21" reqwest = { version = "0.12", features = ["multipart", "cookies"] } # rfd 0.14.0 在ubuntu上编译失败 rfd = "0.15" @@ -106,8 +106,8 @@ win-toast-notify = "0.1.6" notify-rust = "4.11" [target.'cfg(target_os = "macos")'.dependencies] -cocoa = "0.26" -winit = "0.30.0" +cocoa = "0.26.1" +winit = "0.30.11" objc = "0.2.7" [build-dependencies] @@ -115,4 +115,4 @@ windres = "*" [dev-dependencies] -tao = "0.33" +tao = "0.34" diff --git a/windSend-rs/src/config.rs b/windSend-rs/src/config.rs index cbcbe1ddd..943be20ae 100644 --- a/windSend-rs/src/config.rs +++ b/windSend-rs/src/config.rs @@ -174,9 +174,9 @@ impl Config { pub fn save(&self) -> Result<(), String> { self.empty_check()?; let file = std::fs::File::create(&*CONFIG_FILE_PATH) - .map_err(|err| format!("create config file error: {}", err))?; + .map_err(|err| format!("create config file error: {err}"))?; serde_yaml::to_writer(file, self) - .map_err(|err| format!("write config file error: {}", err))?; + .map_err(|err| format!("write config file error: {err}"))?; Ok(()) } pub fn save_and_set(&self) -> Result<(), String> { @@ -189,10 +189,10 @@ impl Config { #[cfg(not(all(target_os = "linux", feature = "disable-systray-support")))] if self.auto_start { if let Err(e) = START_HELPER.set_auto_start() { - return Err(format!("set_auto_start error: {}", e)); + return Err(format!("set_auto_start error: {e}")); } } else if let Err(e) = START_HELPER.unset_auto_start() { - return Err(format!("unset_auto_start error: {}", e)); + return Err(format!("unset_auto_start error: {e}")); } crate::language::LANGUAGE_MANAGER @@ -245,7 +245,7 @@ fn init_global_config() -> Config { if let Some(parent_dir) = CONFIG_FILE_PATH.parent() { if !parent_dir.exists() { if let Err(err) = std::fs::create_dir_all(parent_dir) { - panic!("Failed to create config directory: {}", err); + panic!("Failed to create config directory: {err}"); } } } @@ -253,18 +253,18 @@ fn init_global_config() -> Config { if !CONFIG_FILE_PATH.exists() { let cnf = Config::generate_default(); if let Err(err) = cnf.save_and_set() { - panic!("init_global_config error: {}", err); + panic!("init_global_config error: {err}"); } return cnf; } let file = std::fs::File::open(&*CONFIG_FILE_PATH).unwrap(); let cnf = serde_yaml::from_reader(file); if let Err(err) = cnf { - panic!("deserialize config file error: {}", err); + panic!("deserialize config file error: {err}"); } let cnf: Config = cnf.unwrap(); if let Err(err) = cnf.set() { - panic!("init_global_config error: {}", err); + panic!("init_global_config error: {err}"); } if cnf.allow_to_be_searched_once { @@ -362,7 +362,7 @@ fn init_tls_config() { { let result = utils::tls::generate_ca_and_signed_certificate_pair(); if let Err(err) = result { - panic!("init_tls_config error: {}", err); + panic!("init_tls_config error: {err}"); } let ([cert_pem, priv_pem], [ca_cert_pem, ca_key_pem]) = result.unwrap(); std::fs::write(cert_path, cert_pem).unwrap(); diff --git a/windSend-rs/src/file.rs b/windSend-rs/src/file.rs index 6fc6965d1..50d743929 100644 --- a/windSend-rs/src/file.rs +++ b/windSend-rs/src/file.rs @@ -551,13 +551,13 @@ impl FileReceiveSessionManager { save_path ); if failure_count > 0 { - msg = format!("{}\n{} files failed to save", msg, failure_count); + msg = format!("{msg}\n{failure_count} files failed to save"); } crate::utils::inform(&msg, &op_info.requested_device_name, Some(save_path)); } #[cfg(target_os = "windows")] { - let progress_tag = format!("{}", op_id); + let progress_tag = format!("{op_id}"); let value_string = format!("{}/{} files", success_count, op_info.expected_count); let _guard = self.notify_lock.lock().unwrap(); let _ = win_toast_notify::WinToastNotify::progress_complete( diff --git a/windSend-rs/src/language.rs b/windSend-rs/src/language.rs index f868e4e7e..4ba196ba4 100644 --- a/windSend-rs/src/language.rs +++ b/windSend-rs/src/language.rs @@ -20,7 +20,7 @@ impl std::str::FromStr for Language { match s { s if s.starts_with(&Language::ZH.to_str().to_lowercase()) => Ok(Language::ZH), s if s.starts_with(&Language::EN.to_str().to_lowercase()) => Ok(Language::EN), - _ => Err(format!("unknown language: {}", s)), + _ => Err(format!("unknown language: {s}")), } } } diff --git a/windSend-rs/src/main.rs b/windSend-rs/src/main.rs index 63d8da71b..b0b3a5cb2 100644 --- a/windSend-rs/src/main.rs +++ b/windSend-rs/src/main.rs @@ -46,15 +46,15 @@ fn init() { fn panic_hook(info: &std::panic::PanicHookInfo) { error!("panic: {}", info); let backtrace = backtrace::Backtrace::new(); - let panic_message = format!("Panic: {}\n{:?}", info, info); - let panic_log_message = format!("{}\n\nBacktrace:\n{:?}", panic_message, backtrace); + let panic_message = format!("Panic: {info}\n{info:?}"); + let panic_log_message = format!("{panic_message}\n\nBacktrace:\n{backtrace:?}"); if let Ok(mut f) = std::fs::OpenOptions::new() .append(true) .create(true) .open(std::path::Path::new(&*config::DEFAULT_LOG_DIR).join("panic.log")) { use std::io::Write; - let _ = writeln!(f, "{}", panic_log_message); + let _ = writeln!(f, "{panic_log_message}"); } #[cfg(not(feature = "disable-systray-support"))] { @@ -62,8 +62,7 @@ fn panic_hook(info: &std::panic::PanicHookInfo) { _ = MessageDialog::new() .set_title("WindSend-S-Rust") .set_description(format!( - "WindSend-S-Rust has crashed. Please check the log file for more information.\n\n{}", - panic_message + "WindSend-S-Rust has crashed. Please check the log file for more information.\n\n{panic_message}", )) .set_level(Error) .show(); diff --git a/windSend-rs/src/relay/protocol.rs b/windSend-rs/src/relay/protocol.rs index 2d0dc5b64..8f5860d24 100644 --- a/windSend-rs/src/relay/protocol.rs +++ b/windSend-rs/src/relay/protocol.rs @@ -27,7 +27,7 @@ impl TryFrom for StatusCode { -1 => Ok(StatusCode::Success), 1 => Ok(StatusCode::AuthFailed), 2 => Ok(StatusCode::KdfSaltMismatch), - _ => Err(format!("Invalid StatusCode value: {}", value)), + _ => Err(format!("Invalid StatusCode value: {value}")), } } } diff --git a/windSend-rs/src/route/copy.rs b/windSend-rs/src/route/copy.rs index 4fd126d3a..08447a5d3 100644 --- a/windSend-rs/src/route/copy.rs +++ b/windSend-rs/src/route/copy.rs @@ -154,7 +154,7 @@ async fn send_files<'a, T: IntoIterator + std::fmt::Debug>( let body = match serde_json::to_vec(&resp_paths) { Ok(body) => body, Err(err) => { - let msg = format!("serde_json::to_vec failed, err: {}", err); + let msg = format!("serde_json::to_vec failed, err: {err}"); error!("{}", &msg); let _ = resp_common_error_msg(conn, &msg).await; return Err(()); @@ -177,7 +177,7 @@ async fn send_clipboard_image( let image_name = chrono::Local::now().format("%Y%m%d%H%M%S").to_string() + ".png"; let raw_image = match crate::config::CLIPBOARD.read_image() { Ok(raw_image) => raw_image, - Err(err) => return Err(format!("read clipboard image failed, err: {}", err).into()), + Err(err) => return Err(format!("read clipboard image failed, err: {err}").into()), }; let dyn_img: image::DynamicImage; let mut cursor_buf: std::io::Cursor>; @@ -194,7 +194,7 @@ async fn send_clipboard_image( use clipboard_rs::common::RustImage; dyn_img = match image2.get_dynamic_image() { Ok(img) => img, - Err(err) => return Err(format!("image2.get_dynamic_image failed, err: {}", err).into()), + Err(err) => return Err(format!("image2.get_dynamic_image failed, err: {err}").into()), }; cursor_buf = std::io::Cursor::new(Vec::with_capacity(1024 * 100)); } else { @@ -215,7 +215,7 @@ async fn send_clipboard_image( async fn send_clipboard_text(conn: &mut TlsStream) -> Result<(), String> { let data_text = match crate::config::CLIPBOARD.read_text() { Ok(data_text) => data_text, - Err(err) => return Err(format!("read clipboard text failed, err: {}", err)), + Err(err) => return Err(format!("read clipboard text failed, err: {err}")), }; send_msg_with_body( conn, @@ -242,7 +242,7 @@ pub async fn download_handler(conn: &mut TlsStream, head: RouteRecvHe let file = tokio::fs::File::open(&head.path).await; if let Err(err) = file { error!("open file failed, err: {}", err); - let r = resp_common_error_msg(conn, &format!("open file failed, err: {}", err)).await; + let r = resp_common_error_msg(conn, &format!("open file failed, err: {err}")).await; return r.is_ok(); } let resp = RouteRespHead { diff --git a/windSend-rs/src/route/paste.rs b/windSend-rs/src/route/paste.rs index 4362ee822..20edf1a14 100644 --- a/windSend-rs/src/route/paste.rs +++ b/windSend-rs/src/route/paste.rs @@ -23,7 +23,7 @@ pub async fn paste_text_handler(conn: &mut TlsStream, head: RouteRecv if let Err(e) = crate::config::CLIPBOARD.write_text(Cow::clone(&body)) { error!("set clipboard text failed, err: {}", e); - resp_common_error_msg(conn, &format!("set clipboard failed, err: {}", e)) + resp_common_error_msg(conn, &format!("set clipboard failed, err: {e}")) .await .ok(); return; @@ -58,7 +58,7 @@ pub async fn sync_text_handler(conn: &mut TlsStream, head: RouteRecvH let cur_clipboard_text = match crate::config::CLIPBOARD.read_text() { Ok(text) => text, Err(e) => { - let msg = format!("read clipboard text failed, err: {}", e); + let msg = format!("read clipboard text failed, err: {e}"); info!("{}", msg); // let _ = resp_common_error_msg(conn, &msg).await; String::new() @@ -68,7 +68,7 @@ pub async fn sync_text_handler(conn: &mut TlsStream, head: RouteRecvH // If the clipboard content is the same as the current content, do not set it to avoid triggering the clipboard change event if cur_clipboard_text != body { if let Err(e) = crate::config::CLIPBOARD.write_text(body) { - let msg = format!("set clipboard text failed, err: {}", e); + let msg = format!("set clipboard text failed, err: {e}"); error!("{}", msg); let _ = resp_common_error_msg(conn, &msg).await; return; @@ -115,7 +115,7 @@ pub async fn paste_file_handler(conn: &mut TlsStream, head: RouteRecv if let Err(err) = file { error!("create file: {} error: {}", head.path, err); let _ = tokio::io::copy(&mut conn.take(head.data_len as u64), &mut tokio::io::sink()).await; - return resp_common_error_msg(conn, &format!("create file error: {}", err)) + return resp_common_error_msg(conn, &format!("create file error: {err}")) .await .is_ok(); } @@ -124,7 +124,7 @@ pub async fn paste_file_handler(conn: &mut TlsStream, head: RouteRecv crate::file::FilePartWriter::new(file, head.start as usize, head.end as usize).await; if let Err(err) = file_writer { error!("new file writer failed, err: {}", err); - return resp_common_error_msg(conn, &format!("new file writer failed, err: {}", err)) + return resp_common_error_msg(conn, &format!("new file writer failed, err: {err}")) .await .is_ok(); } @@ -177,7 +177,7 @@ pub async fn paste_file_handler(conn: &mut TlsStream, head: RouteRecv let n = tokio::io::copy(&mut conn_reader.take(data_len as u64), &mut file_buf_writer).await; // let n = tokio::io::copy_buf(&mut conn_buf_reader, &mut file_buf_writer).await; if let Err(err) = n { - let msg = format!("write file error: {}", err); + let msg = format!("write file error: {err}"); error!("{}", msg); let resp_success = resp_common_error_msg(&mut conn_writer, &msg).await.is_ok(); crate::file::GLOBAL_RECEIVER_SESSION_MANAGER @@ -190,13 +190,13 @@ pub async fn paste_file_handler(conn: &mut TlsStream, head: RouteRecv error!("flush file writer failed, err: {}", err); return resp_common_error_msg( &mut conn_writer, - &format!("flush file writer failed, err: {}", err), + &format!("flush file writer failed, err: {err}"), ) .await .is_ok(); } if n < data_len as u64 { - let msg = format!("write file error, n: {}, dataLen: {}", n, data_len); + let msg = format!("write file error, n: {n}, dataLen: {data_len}"); error!("{}", msg); let resp_success = resp_common_error_msg(&mut conn_writer, &msg).await.is_ok(); crate::file::GLOBAL_RECEIVER_SESSION_MANAGER diff --git a/windSend-rs/src/route/router.rs b/windSend-rs/src/route/router.rs index 4ceb55c25..9b8ec9c22 100644 --- a/windSend-rs/src/route/router.rs +++ b/windSend-rs/src/route/router.rs @@ -47,7 +47,7 @@ pub async fn main_process(mut conn: TlsStream) -> Option { - let msg = format!("unknown action: {:?}", action); + let msg = format!("unknown action: {action:?}"); let _ = crate::route::transfer::resp_common_error_msg(&mut conn, &msg).await; error!("{}", msg); } @@ -171,7 +171,7 @@ async fn match_handler(conn: &mut TlsStream) -> Result<(), ()> { }; let action_resp = serde_json::to_vec(&action_resp); if let Err(e) = &action_resp { - let err = format!("json marshal failed, err: {}", e); + let err = format!("json marshal failed, err: {e}"); error!("{}", err); let _ = crate::route::transfer::resp_common_error_msg(conn, &err).await; return Err(()); diff --git a/windSend-rs/src/utils/auto_start.rs b/windSend-rs/src/utils/auto_start.rs index c3b81ea97..3ef5be541 100644 --- a/windSend-rs/src/utils/auto_start.rs +++ b/windSend-rs/src/utils/auto_start.rs @@ -68,7 +68,7 @@ impl StartHelper { let content = String::from(r#"Set objShell = CreateObject("WScript.Shell")"#) + "\r\n" - + &format!(r#"objShell.CurrentDirectory = "{}""#, path) + + &format!(r#"objShell.CurrentDirectory = "{path}""#) + "\r\n" + &format!(r#"objShell.Run "powershell /c .\\{}""#, self.exe_name) + ",0"; diff --git a/windSend-rs/src/utils/util.rs b/windSend-rs/src/utils/util.rs index 02e066087..f710f06ed 100644 --- a/windSend-rs/src/utils/util.rs +++ b/windSend-rs/src/utils/util.rs @@ -319,10 +319,10 @@ pub fn generate_unique_filepath(path: impl AsRef) -> std::io::R .to_string(); for i in 1..100 { let new_name = if !file_ext.is_empty() { - let name = name.trim_end_matches(&format!(".{}", file_ext)); - format!("{}({}).{}", name, i, file_ext) + let name = name.trim_end_matches(&format!(".{file_ext}")); + format!("{name}({i}).{file_ext}") } else { - format!("{}({})", name, i) + format!("{name}({i})") }; let new_path = dir.join(new_name); if !new_path.exists() { @@ -376,7 +376,7 @@ where } else if bytes_f64 >= KB { format!("{:.2} KB", bytes_f64 / KB) } else { - format!("{} B", bytes) + format!("{bytes} B") } } diff --git a/windSend-rs/src/web.rs b/windSend-rs/src/web.rs index 5bbe32dbf..16bbd4a54 100644 --- a/windSend-rs/src/web.rs +++ b/windSend-rs/src/web.rs @@ -57,7 +57,7 @@ pub async fn post_content_to_web(context: &[u8]) -> Result<(), Box