fix: 🚨 fix clippy lint warning

NJUPT-SAST · Feb 11, 2024 · bafccaf · bafccaf
1 parent 71f1dba
commit bafccaf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -26,8 +26,8 @@ jobs:
         run: |
           sudo apt update && sudo apt upgrade -y && \
           sudo apt install -y protobuf-compiler libprotobuf-dev
-      - name: Build
-        run: cargo build --verbose
+      - name: Run clippy lint
+        run: cargo clippy --all-targets --all-features
       - name: Run tests
         run: cargo test --verbose
       - name: Build Debian package

diff --git a/src/user.rs b/src/user.rs
@@ -2,33 +2,25 @@ use std::sync::OnceLock;
 
 use uzers::{get_group_by_name, get_user_by_name};
 
-const BUILDER_UID_LOCK: OnceLock<Option<u32>> = OnceLock::new();
-const BUILDER_GID_LOCK: OnceLock<Option<u32>> = OnceLock::new();
-const RUNNER_UID_LOCK: OnceLock<Option<u32>> = OnceLock::new();
-const RUNNER_GID_LOCK: OnceLock<Option<u32>> = OnceLock::new();
+static BUILDER_UID_LOCK: OnceLock<Option<u32>> = OnceLock::new();
+static BUILDER_GID_LOCK: OnceLock<Option<u32>> = OnceLock::new();
+static RUNNER_UID_LOCK: OnceLock<Option<u32>> = OnceLock::new();
+static RUNNER_GID_LOCK: OnceLock<Option<u32>> = OnceLock::new();
 
 pub fn builder_uid() -> Option<u32> {
-    BUILDER_UID_LOCK
-        .get_or_init(|| get_user_by_name("rsjudge-builder").map(|u| u.uid()))
-        .clone()
+    *BUILDER_UID_LOCK.get_or_init(|| get_user_by_name("rsjudge-builder").map(|u| u.uid()))
 }
 
 pub fn builder_gid() -> Option<u32> {
-    BUILDER_GID_LOCK
-        .get_or_init(|| get_group_by_name("rsjudge-builder").map(|g| g.gid()))
-        .clone()
+    *BUILDER_GID_LOCK.get_or_init(|| get_group_by_name("rsjudge-builder").map(|g| g.gid()))
 }
 
 pub fn runner_uid() -> Option<u32> {
-    RUNNER_UID_LOCK
-        .get_or_init(|| get_user_by_name("rsjudge-runner").map(|u| u.uid()))
-        .clone()
+    *RUNNER_UID_LOCK.get_or_init(|| get_user_by_name("rsjudge-runner").map(|u| u.uid()))
 }
 
 pub fn runner_gid() -> Option<u32> {
-    RUNNER_GID_LOCK
-        .get_or_init(|| get_group_by_name("rsjudge-runner").map(|g| g.gid()))
-        .clone()
+    *RUNNER_GID_LOCK.get_or_init(|| get_group_by_name("rsjudge-runner").map(|g| g.gid()))
 }
 
 #[cfg(all(test, unix))]