Merge pull request #589 from xrelkd/feat/toolchain

xrelkd · web-flow · commit 3e7974169b42 · 2025-09-18T16:38:47.000+08:00
Replace `lazy-static` with `std::sync::LazyLock`
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -74,6 +74,7 @@ coherence_leak_check                     = "deny"
 confusable_idents                        = "deny"
 const_evaluatable_unchecked              = "deny"
 const_item_mutation                      = "deny"
+dangling_pointers_from_temporaries       = "deny"
 dead_code                                = "deny"
 deprecated                               = "deny"
 deprecated_where_clause_location         = "deny"
@@ -130,13 +131,11 @@ semicolon_in_expressions_from_macros     = "deny"
 special_module_name                      = "deny"
 stable_features                          = "deny"
 suspicious_double_ref_op                 = "deny"
-temporary_cstring_as_ptr                 = "deny"
 trivial_bounds                           = "deny"
 type_alias_bounds                        = "deny"
 tyvar_behind_raw_pointer                 = "deny"
 uncommon_codepoints                      = "deny"
 unconditional_recursion                  = "deny"
-undefined_naked_function_abi             = "deny"
 unexpected_cfgs                          = "deny"
 ungated_async_fn_track_caller            = "deny"
 uninhabited_static                       = "deny"
diff --git a/caracal-daemon/src/cli/mod.rs b/caracal-daemon/src/cli/mod.rs
@@ -115,8 +115,7 @@ mod tests {
 
     #[test]
     fn test_command_simple() {
-        if let Some(Commands::Version { .. }) =
-            Cli::parse_from(["program_name", "version"]).commands
+        if matches!(Cli::parse_from(["program_name", "version"]).commands, Some(Commands::Version))
         {
             // everything is good.
         } else {
diff --git a/caracal-tui/src/cli/mod.rs b/caracal-tui/src/cli/mod.rs
@@ -48,7 +48,7 @@ impl Default for Cli {
 }
 
 impl Cli {
-    #[allow(clippy::too_many_lines)]
+    #[allow(clippy::result_large_err, clippy::too_many_lines)]
     pub fn run(self) -> Result<(), Error> {
         let Self { commands, log_level, config_file } = self;
 
@@ -105,8 +105,7 @@ mod tests {
 
     #[test]
     fn test_command_simple() {
-        if let Some(Commands::Version { .. }) =
-            Cli::parse_from(["program_name", "version"]).commands
+        if matches!(Cli::parse_from(["program_name", "version"]).commands, Some(Commands::Version))
         {
             // everything is good.
         } else {
diff --git a/caracal-tui/src/tui/state_store/state.rs b/caracal-tui/src/tui/state_store/state.rs
@@ -41,5 +41,5 @@ impl State {
 
     pub fn mark_disconnected(&mut self) { self.daemon_version = None; }
 
-    pub fn tick_timer(&mut self) { self.timer += 1; }
+    pub const fn tick_timer(&mut self) { self.timer += 1; }
 }
diff --git a/caracal-tui/src/tui/state_store/state_store.rs b/caracal-tui/src/tui/state_store/state_store.rs
@@ -27,6 +27,7 @@ impl StateStore {
         (Self { state_tx, server_endpoint, access_token }, state_rx)
     }
 
+    #[allow(clippy::cognitive_complexity)]
     pub async fn serve(
         self,
         mut action_rx: mpsc::UnboundedReceiver<Action>,
diff --git a/caracal-tui/src/tui/ui/components/component.rs b/caracal-tui/src/tui/ui/components/component.rs
@@ -12,6 +12,8 @@ pub trait Component {
     where
         Self: Sized;
 
+    // FIXME: Use this method or remove it.
+    #[allow(dead_code)]
     fn name(&self) -> &str;
 
     fn handle_key_event(&mut self, key: KeyEvent);
diff --git a/caracal-tui/src/tui/ui/pages/mod.rs b/caracal-tui/src/tui/ui/pages/mod.rs
@@ -28,6 +28,8 @@ pub struct AppRouter {
 }
 
 impl AppRouter {
+    // FIXME: Use this method or remove it.
+    #[allow(dead_code)]
     fn get_active_page_component(&self) -> &dyn Component {
         match self.props.active_page {
             ActivePage::StatusPage => &self.status_page,
diff --git a/caracal-tui/src/tui/ui/pages/status/components/information.rs b/caracal-tui/src/tui/ui/pages/status/components/information.rs
@@ -42,7 +42,7 @@ impl Component for InformationArea {
         Self { props: Props::from(state) }
     }
 
-    fn name(&self) -> &str { "Information" }
+    fn name(&self) -> &'static str { "Information" }
 
     fn handle_key_event(&mut self, _key: KeyEvent) {}
 }
diff --git a/caracal-tui/src/tui/ui/pages/status/components/task_status.rs b/caracal-tui/src/tui/ui/pages/status/components/task_status.rs
@@ -88,7 +88,7 @@ impl Component for TaskStatusList {
         Self { props: Props::from(state), ..self }
     }
 
-    fn name(&self) -> &str { "Task Status List" }
+    fn name(&self) -> &'static str { "Task Status List" }
 
     fn handle_key_event(&mut self, key: KeyEvent) {
         if key.kind != KeyEventKind::Press {
@@ -206,7 +206,7 @@ impl ComponentRender<RenderProps> for TaskStatusList {
                 Cell::from(status.file_path.file_name().unwrap_or_default().to_string_lossy()),
                 Cell::new(humansize::format_size(total_bytes, humansize::BINARY)),
                 Cell::new(humansize::format_size(
-                    if received_bytes >= total_bytes { 0 } else { total_bytes - received_bytes },
+                    total_bytes.saturating_sub(received_bytes),
                     humansize::BINARY,
                 )),
                 Cell::new(progress_percentage),
diff --git a/caracal-tui/src/tui/ui/pages/status/mod.rs b/caracal-tui/src/tui/ui/pages/status/mod.rs
@@ -48,7 +48,7 @@ impl Component for StatusPage {
         }
     }
 
-    fn name(&self) -> &str { "Status Page" }
+    fn name(&self) -> &'static str { "Status Page" }
 
     fn handle_key_event(&mut self, key: KeyEvent) {
         if key.kind != KeyEventKind::Press {
diff --git a/caracal/src/cli/mod.rs b/caracal/src/cli/mod.rs
@@ -156,7 +156,7 @@ impl Default for Cli {
 }
 
 impl Cli {
-    #[allow(clippy::too_many_lines)]
+    #[allow(clippy::too_many_lines, clippy::result_large_err)]
     pub fn run(self) -> Result<(), Error> {
         let Self {
             commands,
@@ -368,8 +368,7 @@ mod tests {
 
     #[test]
     fn test_command_simple() {
-        if let Some(Commands::Version { .. }) =
-            Cli::parse_from(["program_name", "version"]).commands
+        if matches!(Cli::parse_from(["program_name", "version"]).commands, Some(Commands::Version))
         {
             // everything is good.
         } else {
diff --git a/caracal/src/cli/ui.rs b/caracal/src/cli/ui.rs
@@ -81,7 +81,7 @@ pub fn build_table() -> Table {
 
     if let Some(width) = table.width() {
         let _ = table.set_width(width - 10);
-    };
+    }
 
     table
 }
diff --git a/crates/base/Cargo.toml b/crates/base/Cargo.toml
@@ -18,7 +18,6 @@ http = "1"
 
 bytes       = "1"
 directories = "6"
-lazy_static = "1"
 mime        = "0.3"
 semver      = "1"
 snafu       = "0.8"
diff --git a/crates/base/src/lib.rs b/crates/base/src/lib.rs
@@ -8,10 +8,10 @@ pub mod utils;
 use std::{
     net::{IpAddr, Ipv4Addr},
     path::PathBuf,
+    sync::LazyLock,
 };
 
 use directories::ProjectDirs;
-use lazy_static::lazy_static;
 
 pub const PROJECT_VERSION: &str = env!("CARGO_PKG_VERSION");
 
@@ -24,18 +24,18 @@ pub const DBUS_MANAGER_OBJECT_PATH: &str = "/org/caracal/caracal-daemon/manager"
 
 pub const FALLBACK_FILENAME: &str = "index.html";
 
-lazy_static! {
-    pub static ref PROJECT_SEMVER: semver::Version = semver::Version::parse(PROJECT_VERSION)
-        .unwrap_or(semver::Version {
-            major: 0,
-            minor: 0,
-            patch: 0,
-            pre: semver::Prerelease::EMPTY,
-            build: semver::BuildMetadata::EMPTY
-        });
-    pub static ref DEFAULT_HTTP_USER_AGENT: String =
-        format!("{PROJECT_NAME_WITH_INITIAL_CAPITAL}/{PROJECT_VERSION}");
-}
+pub static PROJECT_SEMVER: LazyLock<semver::Version> = LazyLock::new(|| {
+    semver::Version::parse(PROJECT_VERSION).unwrap_or(semver::Version {
+        major: 0,
+        minor: 0,
+        patch: 0,
+        pre: semver::Prerelease::EMPTY,
+        build: semver::BuildMetadata::EMPTY,
+    })
+});
+
+pub static DEFAULT_HTTP_USER_AGENT: LazyLock<String> =
+    LazyLock::new(|| format!("{PROJECT_NAME_WITH_INITIAL_CAPITAL}/{PROJECT_VERSION}"));
 
 pub const PROJECT_NAME: &str = "caracal";
 pub const PROJECT_NAME_WITH_INITIAL_CAPITAL: &str = "Caracal";
@@ -60,9 +60,9 @@ pub const DEFAULT_WEB_HOST: IpAddr = IpAddr::V4(Ipv4Addr::LOCALHOST);
 pub const DEFAULT_METRICS_PORT: u16 = 37002;
 pub const DEFAULT_METRICS_HOST: IpAddr = IpAddr::V4(Ipv4Addr::LOCALHOST);
 
-lazy_static::lazy_static! {
-pub static ref PROJECT_CONFIG_DIR: PathBuf = ProjectDirs::from("", PROJECT_NAME, PROJECT_NAME)
-            .expect("Creating `ProjectDirs` should always success")
-            .config_dir()
-            .to_path_buf();
-}
+pub static PROJECT_CONFIG_DIR: LazyLock<PathBuf> = LazyLock::new(|| {
+    ProjectDirs::from("", PROJECT_NAME, PROJECT_NAME)
+        .expect("Creating `ProjectDirs` should always success")
+        .config_dir()
+        .to_path_buf()
+});
diff --git a/crates/base/src/model/task.rs b/crates/base/src/model/task.rs
@@ -87,11 +87,7 @@ impl ProgressChunk {
     #[must_use]
     pub const fn remaining(&self) -> u64 {
         let len = self.len();
-        if len >= self.received {
-            len - self.received
-        } else {
-            0
-        }
+        len.saturating_sub(self.received)
     }
 
     #[must_use]
diff --git a/crates/base/src/utils/retry_interval.rs b/crates/base/src/utils/retry_interval.rs
@@ -23,7 +23,7 @@ impl RetryInterval {
         self
     }
 
-    pub fn reset(&mut self) { self.count = 0; }
+    pub const fn reset(&mut self) { self.count = 0; }
 
     #[must_use]
     pub const fn limit(&self) -> usize { self.limit }
diff --git a/crates/engine/src/downloader/chunk.rs b/crates/engine/src/downloader/chunk.rs
@@ -18,14 +18,10 @@ impl Chunk {
 
     pub const fn remaining(&self) -> u64 {
         let len = self.len();
-        if len >= self.received {
-            len - self.received
-        } else {
-            0
-        }
+        len.saturating_sub(self.received)
     }
 
-    pub fn split(&mut self) -> Option<Self> {
+    pub const fn split(&mut self) -> Option<Self> {
         if self.received >= self.len() || self.is_completed {
             None
         } else {
@@ -45,7 +41,7 @@ impl Chunk {
         }
     }
 
-    pub fn freeze(&mut self) -> Option<Self> {
+    pub const fn freeze(&mut self) -> Option<Self> {
         if self.received == 0 {
             None
         } else {
diff --git a/crates/engine/src/downloader/factory.rs b/crates/engine/src/downloader/factory.rs
@@ -41,6 +41,7 @@ pub struct Builder {
 
 impl Builder {
     /// # Errors
+    #[allow(clippy::result_large_err)]
     pub fn new() -> Result<Self, Error> {
         Ok(Self {
             default_concurrent_number: 5,
@@ -95,6 +96,7 @@ impl Builder {
         self
     }
 
+    #[allow(clippy::result_large_err)]
     pub fn build(self) -> Result<Factory, Error> {
         let Self {
             http_user_agent,
@@ -146,6 +148,7 @@ pub struct Factory {
 impl Factory {
     /// # Errors
     #[inline]
+    #[allow(clippy::result_large_err)]
     pub fn builder() -> Result<Builder, Error> { Builder::new() }
 
     /// # Errors
diff --git a/crates/engine/src/downloader/mod.rs b/crates/engine/src/downloader/mod.rs
@@ -220,7 +220,7 @@ impl Downloader {
         Ok(summary)
     }
 
-    #[allow(clippy::too_many_lines)]
+    #[allow(clippy::cognitive_complexity, clippy::too_many_lines)]
     async fn serve_with_multiple_workers(
         ServeWithMultipleWorkerOptions {
             worker_number,
diff --git a/crates/engine/src/downloader/status.rs b/crates/engine/src/downloader/status.rs
@@ -43,7 +43,7 @@ impl DownloaderStatus {
     pub fn chunks(&self) -> Vec<model::ProgressChunk> { self.chunks.clone() }
 
     #[must_use]
-    pub fn total_chunk_count(&self) -> usize { self.chunks.len() }
+    pub const fn total_chunk_count(&self) -> usize { self.chunks.len() }
 
     #[must_use]
     pub fn completed_chunk_count(&self) -> usize {
@@ -53,11 +53,7 @@ impl DownloaderStatus {
     #[must_use]
     pub fn remaining(&self) -> u64 {
         let total_received = self.total_received();
-        if self.content_length < total_received {
-            0
-        } else {
-            self.content_length - total_received
-        }
+        self.content_length.saturating_sub(total_received)
     }
 
     #[inline]
diff --git a/crates/engine/src/downloader/transfer_status.rs b/crates/engine/src/downloader/transfer_status.rs
@@ -12,6 +12,7 @@ pub struct TransferStatus {
 }
 
 impl TransferStatus {
+    #[allow(clippy::result_large_err)]
     pub fn new(content_length: u64, chunk_size: u64) -> Result<Self, Error> {
         let chunks = InitialChunks::new(0, content_length - 1, chunk_size)?
             .map(|chunk| (chunk.start, chunk))
@@ -47,11 +48,7 @@ impl TransferStatus {
 
     pub fn remaining(&self) -> u64 {
         let total_received = self.total_received();
-        if self.content_length < total_received {
-            0
-        } else {
-            self.content_length - total_received
-        }
+        self.content_length.saturating_sub(total_received)
     }
 
     pub fn split(&mut self) -> Option<(Chunk, Chunk)> {
@@ -99,7 +96,7 @@ impl TransferStatus {
     #[must_use]
     pub const fn concurrent_number(&self) -> usize { self.concurrent_number }
 
-    pub fn update_concurrent_number(&mut self, concurrent_number: usize) {
+    pub const fn update_concurrent_number(&mut self, concurrent_number: usize) {
         self.concurrent_number = concurrent_number;
     }
 }
@@ -117,6 +114,7 @@ impl InitialChunks {
     /// * `start` - the first byte of the file, typically 0
     /// * `end` - the highest value in bytes, typically content-length - 1
     /// * `chunk_size` - the desired size of the chunks
+    #[allow(clippy::result_large_err)]
     pub const fn new(start: u64, end: u64, chunk_size: u64) -> Result<Self, Error> {
         if chunk_size == 0 {
             return Err(Error::BadChunkSize { value: chunk_size });
diff --git a/crates/engine/src/error.rs b/crates/engine/src/error.rs
@@ -5,6 +5,7 @@ use snafu::Snafu;
 
 pub type Result<T> = std::result::Result<T, Error>;
 
+#[allow(clippy::result_large_err)]
 #[derive(Debug, Snafu)]
 #[snafu(visibility(pub))]
 pub enum Error {
diff --git a/crates/engine/src/fetcher/http.rs b/crates/engine/src/fetcher/http.rs
@@ -17,6 +17,7 @@ pub struct Fetcher {
 }
 
 impl Fetcher {
+    #[allow(clippy::cognitive_complexity)]
     pub async fn new(client: reqwest::Client, uri: http::Uri) -> Result<Self> {
         let resp =
             client.head(uri.to_string()).send().await.context(error::FetchHttpHeaderSnafu)?;
diff --git a/crates/engine/src/task_scheduler/worker.rs b/crates/engine/src/task_scheduler/worker.rs
diff --git a/crates/metrics/Cargo.toml b/crates/metrics/Cargo.toml
diff --git a/crates/metrics/src/server.rs b/crates/metrics/src/server.rs
diff --git a/crates/proto/src/error.rs b/crates/proto/src/error.rs
diff --git a/crates/server/Cargo.toml b/crates/server/Cargo.toml
diff --git a/crates/server/src/grpc/system.rs b/crates/server/src/grpc/system.rs
diff --git a/crates/server/src/lib.rs b/crates/server/src/lib.rs
diff --git a/crates/server/src/metrics/dbus.rs b/crates/server/src/metrics/dbus.rs
diff --git a/crates/server/src/metrics/grpc.rs b/crates/server/src/metrics/grpc.rs
diff --git a/flake.lock b/flake.lock

Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,7 @@ mod tests {`
`115`	`115`
`116`	`116`	`#[test]`
`117`	`117`	`fn test_command_simple() {`
`118`		`- if let Some(Commands::Version { .. }) =`
`119`		`- Cli::parse_from(["program_name", "version"]).commands`
	`118`	`+ if matches!(Cli::parse_from(["program_name", "version"]).commands, Some(Commands::Version))`
`120`	`119`	`{`
`121`	`120`	`// everything is good.`
`122`	`121`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,5 @@ impl State {`
`41`	`41`
`42`	`42`	`pub fn mark_disconnected(&mut self) { self.daemon_version = None; }`
`43`	`43`
`44`		`- pub fn tick_timer(&mut self) { self.timer += 1; }`
	`44`	`+ pub const fn tick_timer(&mut self) { self.timer += 1; }`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ impl StateStore {`
`27`	`27`	`(Self { state_tx, server_endpoint, access_token }, state_rx)`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ #[allow(clippy::cognitive_complexity)]`
`30`	`31`	`pub async fn serve(`
`31`	`32`	`self,`
`32`	`33`	`mut action_rx: mpsc::UnboundedReceiver<Action>,`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ pub struct AppRouter {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`impl AppRouter {`
	`31`	`+ // FIXME: Use this method or remove it.`
	`32`	`+ #[allow(dead_code)]`
`31`	`33`	`fn get_active_page_component(&self) -> &dyn Component {`
`32`	`34`	`match self.props.active_page {`
`33`	`35`	`ActivePage::StatusPage => &self.status_page,`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ impl Component for InformationArea {`
`42`	`42`	`Self { props: Props::from(state) }`
`43`	`43`	`}`
`44`	`44`
`45`		`- fn name(&self) -> &str { "Information" }`
	`45`	`+ fn name(&self) -> &'static str { "Information" }`
`46`	`46`
`47`	`47`	`fn handle_key_event(&mut self, _key: KeyEvent) {}`
`48`	`48`	`}`