From 5633896d14f39d0b6595c3e5f7cf3650690b3f45 Mon Sep 17 00:00:00 2001 From: NimBold Date: Tue, 28 Jul 2026 18:29:14 +0330 Subject: [PATCH] chore(deps): refresh package locks and Rust warnings --- engine-sources.lock.json | 8 +-- package-lock.json | 8 +-- package.json | 2 +- src-tauri/Cargo.lock | 42 ++++++------ src-tauri/src/extension_server.rs | 2 +- src-tauri/src/ipc.rs | 27 ++------ src-tauri/src/lib.rs | 8 ++- src-tauri/src/scheduler.rs | 107 +++++++++++++++++------------- 8 files changed, 102 insertions(+), 102 deletions(-) diff --git a/engine-sources.lock.json b/engine-sources.lock.json index 6b5507e..593cab6 100644 --- a/engine-sources.lock.json +++ b/engine-sources.lock.json @@ -14,8 +14,8 @@ }, "ffmpeg": { "version": "8.1.2-31-g8c9502e9b0", - "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2026-07-26-13-28/ffmpeg-n8.1.2-31-g8c9502e9b0-win64-gpl-8.1.zip", - "sha256": "2b6a26a3943892dc61ea62545253efc1495580f67346285a6b12713d70c1a2ff" + "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2026-07-28-13-32/ffmpeg-n8.1.2-31-g8c9502e9b0-win64-gpl-8.1.zip", + "sha256": "e88033629ebecd56d01e6b5b2e693f07d3ec3ed0d14188fc18d7d0bc9c3e6709" }, "aria2c": { "version": "1.37.0", @@ -36,8 +36,8 @@ }, "ffmpeg": { "version": "8.1.2-31-g8c9502e9b0", - "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2026-07-26-13-28/ffmpeg-n8.1.2-31-g8c9502e9b0-linux64-gpl-8.1.tar.xz", - "sha256": "00a4cce5118f477da5d6758630ecd70f71ac7601dca377d819b619613cb577a0" + "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2026-07-28-13-32/ffmpeg-n8.1.2-31-g8c9502e9b0-linux64-gpl-8.1.tar.xz", + "sha256": "8f61aa8abfc2174bbb60fe0bcf7a23c7940a96d4e34c6694bf0ca48b23ce67f0" }, "aria2c": { "version": "1.37.0", diff --git a/package-lock.json b/package-lock.json index 1139570..c89bc40 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,7 @@ "@types/react-dom": "^19.2.3", "@vitejs/plugin-react": "^6.0.4", "autoprefixer": "^10.5.4", - "postcss": "^8.5.23", + "postcss": "^8.5.24", "tailwindcss": "^4.3.3", "typescript": "^7.0.2", "vite": "^8.1.5", @@ -2223,9 +2223,9 @@ } }, "node_modules/postcss": { - "version": "8.5.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.23.tgz", - "integrity": "sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg==", + "version": "8.5.24", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.24.tgz", + "integrity": "sha512-8RyVklq0owXUTa4xlpzu4l9AaVKIdQvAcOHZWaMh98HgySsUtxRVf/chRe3dsSLqb6i40BzGRzEUddRaI+9TSw==", "funding": [ { "type": "opencollective", diff --git a/package.json b/package.json index 58ba68e..b4f7a5f 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "@types/react-dom": "^19.2.3", "@vitejs/plugin-react": "^6.0.4", "autoprefixer": "^10.5.4", - "postcss": "^8.5.23", + "postcss": "^8.5.24", "tailwindcss": "^4.3.3", "typescript": "^7.0.2", "vite": "^8.1.5", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index cbd855c..d63fb36 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -515,9 +515,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.2.4" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2d30e4173c4026932d51d31d6b0613b1fd3014bf3f9f8943d4ba139c437ba0" +checksum = "bb1307f12aa967b5a58416e87b3653360e0fd614a016b6e970db08fecbb1b80d" dependencies = [ "serde_core", ] @@ -1055,7 +1055,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -1072,13 +1072,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" +checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.3", ] [[package]] @@ -1275,7 +1275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2761,7 +2761,7 @@ dependencies = [ "png 0.18.1", "serde", "thiserror 2.0.19", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -3237,7 +3237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" dependencies = [ "libc", - "windows-sys 0.45.0", + "windows-sys 0.61.2", ] [[package]] @@ -3866,7 +3866,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3922,7 +3922,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4001,9 +4001,9 @@ dependencies = [ [[package]] name = "schemars" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" +checksum = "687274d293b6cdc6e73e0fee520bf2049650090d7164f87672d212a3c530cf4a" dependencies = [ "dyn-clone", "ref-cast", @@ -4231,7 +4231,7 @@ dependencies = [ "indexmap 1.9.3", "indexmap 2.14.0", "schemars 0.9.0", - "schemars 1.2.1", + "schemars 1.2.2", "serde_core", "serde_json", "serde_with_macros", @@ -4409,7 +4409,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -5113,7 +5113,7 @@ dependencies = [ "getrandom 0.4.3", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -5432,9 +5432,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.1.2+spec-1.1.0" +version = "1.1.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" +checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56" dependencies = [ "winnow 1.0.4", ] @@ -5577,7 +5577,7 @@ dependencies = [ "png 0.18.1", "serde", "thiserror 2.0.19", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -5662,7 +5662,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e" dependencies = [ "memoffset 0.9.1", "tempfile", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -6128,7 +6128,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/src-tauri/src/extension_server.rs b/src-tauri/src/extension_server.rs index acaf8ca..5f3033c 100644 --- a/src-tauri/src/extension_server.rs +++ b/src-tauri/src/extension_server.rs @@ -436,7 +436,7 @@ fn normalize_download(mut payload: ExtensionRequest) -> Option= 2; let batch_name = batch - .then(|| payload.batch_name) + .then_some(payload.batch_name) .flatten() .and_then(|value| { let value = value.trim().to_string(); diff --git a/src-tauri/src/ipc.rs b/src-tauri/src/ipc.rs index cfcf3dc..8de852b 100644 --- a/src-tauri/src/ipc.rs +++ b/src-tauri/src/ipc.rs @@ -214,10 +214,11 @@ pub enum Theme { Nord, } -#[derive(Clone, Debug, Serialize, Deserialize, TS)] +#[derive(Clone, Debug, Default, Serialize, Deserialize, TS)] #[serde(rename_all = "kebab-case")] #[ts(export, export_to = "../../src/bindings/")] pub enum FontFamily { + #[default] System, Inter, Outfit, @@ -229,16 +230,11 @@ pub enum FontFamily { Monospace, } -impl Default for FontFamily { - fn default() -> Self { - Self::System - } -} - -#[derive(Clone, Debug, Serialize, Deserialize, TS)] +#[derive(Clone, Debug, Default, Serialize, Deserialize, TS)] #[serde(rename_all = "lowercase")] #[ts(export, export_to = "../../src/bindings/")] pub enum WindowControlStyle { + #[default] Auto, Macos, Windows, @@ -246,27 +242,16 @@ pub enum WindowControlStyle { Minimal, } -impl Default for WindowControlStyle { - fn default() -> Self { - Self::Auto - } -} - -#[derive(Clone, Debug, Serialize, Deserialize, TS)] +#[derive(Clone, Debug, Default, Serialize, Deserialize, TS)] #[serde(rename_all = "lowercase")] #[ts(export, export_to = "../../src/bindings/")] pub enum CalendarPreference { + #[default] Gregorian, Persian, Hebrew, } -impl Default for CalendarPreference { - fn default() -> Self { - Self::Gregorian - } -} - #[derive(Clone, Debug, Serialize, Deserialize, TS)] #[serde(rename_all = "lowercase")] #[ts(export, export_to = "../../src/bindings/")] diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 9bc91a2..18d86f1 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -8851,9 +8851,11 @@ fn observe_aria2_connections_with_epoch( now, } = sample; if observation.gid != gid || observation.control_epoch != control_epoch { - let preserved_recovery_attempts = (observation.control_epoch == control_epoch) - .then_some(observation.recovery_attempts) - .unwrap_or_default(); + let preserved_recovery_attempts = if observation.control_epoch == control_epoch { + observation.recovery_attempts + } else { + Default::default() + }; *observation = Aria2ConnectionObservation { gid: gid.to_string(), control_epoch, diff --git a/src-tauri/src/scheduler.rs b/src-tauri/src/scheduler.rs index e7a46cc..f003867 100644 --- a/src-tauri/src/scheduler.rs +++ b/src-tauri/src/scheduler.rs @@ -26,17 +26,30 @@ fn stop_is_due( && last_stop_key != stop_key } -fn overnight_stop_is_due( +struct OvernightStopCheck<'a> { stop_time_enabled: bool, start_minute: Option, stop_minute: Option, current_minute: u32, previous_day_allowed: bool, - last_start_key: &str, - previous_start_key: &str, - last_stop_key: &str, - stop_key: &str, -) -> bool { + last_start_key: &'a str, + previous_start_key: &'a str, + last_stop_key: &'a str, + stop_key: &'a str, +} + +fn overnight_stop_is_due(check: OvernightStopCheck<'_>) -> bool { + let OvernightStopCheck { + stop_time_enabled, + start_minute, + stop_minute, + current_minute, + previous_day_allowed, + last_start_key, + previous_start_key, + last_stop_key, + stop_key, + } = check; stop_time_enabled && previous_day_allowed && start_minute.zip(stop_minute).is_some_and(|(start, stop)| { @@ -126,17 +139,17 @@ pub fn spawn_scheduler( let previous_start_key = previous_day .map(|day| format!("{}-start", day.format("%Y-%m-%d"))) .unwrap_or_default(); - let overnight_stop_due = overnight_stop_is_due( - scheduler.stop_time_enabled, + let overnight_stop_due = overnight_stop_is_due(OvernightStopCheck { + stop_time_enabled: scheduler.stop_time_enabled, start_minute, stop_minute, current_minute, previous_day_allowed, - &scheduler_last_start_key, - &previous_start_key, - &scheduler_last_stop_key, - &stop_key, - ); + last_start_key: &scheduler_last_start_key, + previous_start_key: &previous_start_key, + last_stop_key: &scheduler_last_stop_key, + stop_key: &stop_key, + }); if (same_day_stop_due || overnight_stop_due) && last_emit @@ -159,7 +172,7 @@ pub fn spawn_scheduler( #[cfg(test)] mod tests { - use super::{minute_of_day, overnight_stop_is_due, stop_is_due}; + use super::{minute_of_day, overnight_stop_is_due, stop_is_due, OvernightStopCheck}; #[test] fn parses_valid_scheduler_times() { @@ -199,38 +212,38 @@ mod tests { #[test] fn overnight_stop_uses_the_previous_day_start() { - assert!(overnight_stop_is_due( - true, - Some(1320), - Some(360), - 420, - true, - "2026-06-22-start", - "2026-06-22-start", - "", - "2026-06-23-stop", - )); - assert!(!overnight_stop_is_due( - true, - Some(1320), - Some(360), - 1380, - true, - "2026-06-22-start", - "2026-06-22-start", - "", - "2026-06-22-stop", - )); - assert!(!overnight_stop_is_due( - true, - Some(1320), - Some(360), - 420, - false, - "2026-06-22-start", - "2026-06-22-start", - "", - "2026-06-23-stop", - )); + assert!(overnight_stop_is_due(OvernightStopCheck { + stop_time_enabled: true, + start_minute: Some(1320), + stop_minute: Some(360), + current_minute: 420, + previous_day_allowed: true, + last_start_key: "2026-06-22-start", + previous_start_key: "2026-06-22-start", + last_stop_key: "", + stop_key: "2026-06-23-stop", + })); + assert!(!overnight_stop_is_due(OvernightStopCheck { + stop_time_enabled: true, + start_minute: Some(1320), + stop_minute: Some(360), + current_minute: 1380, + previous_day_allowed: true, + last_start_key: "2026-06-22-start", + previous_start_key: "2026-06-22-start", + last_stop_key: "", + stop_key: "2026-06-22-stop", + })); + assert!(!overnight_stop_is_due(OvernightStopCheck { + stop_time_enabled: true, + start_minute: Some(1320), + stop_minute: Some(360), + current_minute: 420, + previous_day_allowed: false, + last_start_key: "2026-06-22-start", + previous_start_key: "2026-06-22-start", + last_stop_key: "", + stop_key: "2026-06-23-stop", + })); } }