From f8d93023ddf7624e6aab8660c9cea475120de818 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 28 Mar 2026 17:07:33 +0100
Subject: [PATCH] Fix a couple of warnings

---
 src/context/memory.rs      | 2 +-
 src/cpu_stats.rs           | 4 +---
 src/scheme/pipe.rs         | 6 +++---
 src/scheme/proc.rs         | 2 --
 src/scheme/sys/mod.rs      | 2 +-
 src/scheme/sys/stat.rs     | 1 -
 src/scheme/user.rs         | 2 +-
 src/sync/wait_condition.rs | 2 +-
 8 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/context/memory.rs b/src/context/memory.rs
index 0c2b3c86aa..392b641f67 100644
--- a/src/context/memory.rs
+++ b/src/context/memory.rs
@@ -26,7 +26,7 @@ use crate::{
     sync::CleanLockToken,
 };
 
-use super::{context::HardBlockedReason, file::FileDescription};
+use super::context::HardBlockedReason;
 
 pub const MMAP_MIN_DEFAULT: usize = PAGE_SIZE;
 
diff --git a/src/cpu_stats.rs b/src/cpu_stats.rs
index 06d10525a0..448e1a8faf 100644
--- a/src/cpu_stats.rs
+++ b/src/cpu_stats.rs
@@ -1,11 +1,9 @@
-use alloc::{string::String, vec::Vec};
+use alloc::vec::Vec;
 use core::{
     fmt,
     sync::atomic::{AtomicU64, AtomicU8, AtomicUsize, Ordering},
 };
 
-use crate::cpu_set::LogicalCpuId;
-
 // Note: Using AtomicUsize rather than AtomicU64 as 32bit x86 doesn't support the latter
 /// The number of times (overall) where a CPU switched from one context to another.
 static CONTEXT_SWITCH_COUNT: AtomicUsize = AtomicUsize::new(0);
diff --git a/src/scheme/pipe.rs b/src/scheme/pipe.rs
index 217ed20c00..fbaa17af6a 100644
--- a/src/scheme/pipe.rs
+++ b/src/scheme/pipe.rs
@@ -8,7 +8,7 @@ use hashbrown::{hash_map::DefaultHashBuilder, HashMap};
 use crate::{
     context::{
         context::{bulk_add_fds, bulk_insert_fds},
-        file::{FileDescription, InternalFlags, LockedFileDescription},
+        file::{InternalFlags, LockedFileDescription},
     },
     event,
     sync::{CleanLockToken, Mutex, RwLock, WaitCondition, L1},
@@ -254,7 +254,7 @@ impl KernelScheme for PipeScheme {
         let pipe = Self::get_pipe(key, token)?;
 
         loop {
-            let mut vec = pipe.queue.lock(token.token());
+            let vec = pipe.queue.lock(token.token());
             let (mut vec, mut token) = vec.into_split();
 
             let (s1, s2) = vec.as_slices();
@@ -313,7 +313,7 @@ impl KernelScheme for PipeScheme {
         let pipe = Self::get_pipe(key, token)?;
 
         loop {
-            let mut vec = pipe.queue.lock(token.token());
+            let vec = pipe.queue.lock(token.token());
             let (mut vec, mut token) = vec.into_split();
 
             if !pipe.reader_is_alive.load(Ordering::Relaxed) {
diff --git a/src/scheme/proc.rs b/src/scheme/proc.rs
index 082e052e1e..0e40b86959 100644
--- a/src/scheme/proc.rs
+++ b/src/scheme/proc.rs
@@ -20,8 +20,6 @@ use crate::{
     },
 };
 
-use crate::context::context::FdTbl;
-
 use super::{CallerCtx, KernelSchemes, OpenResult};
 use ::syscall::{ProcSchemeAttrs, SigProcControl, Sigcontrol};
 use alloc::{
diff --git a/src/scheme/sys/mod.rs b/src/scheme/sys/mod.rs
index 32e57a35f5..8ca47e85f4 100644
--- a/src/scheme/sys/mod.rs
+++ b/src/scheme/sys/mod.rs
@@ -5,7 +5,7 @@
 
 use ::syscall::{
     dirent::{DirEntry, DirentBuf, DirentKind},
-    EACCES, EBADFD, EINVAL, EIO, EISDIR, ENOTDIR, EPERM,
+    EACCES, EINVAL, EIO, EISDIR, ENOTDIR, EPERM,
 };
 use alloc::{sync::Arc, vec::Vec};
 use core::{
diff --git a/src/scheme/sys/stat.rs b/src/scheme/sys/stat.rs
index 2652c29efa..2176023d1b 100644
--- a/src/scheme/sys/stat.rs
+++ b/src/scheme/sys/stat.rs
@@ -1,7 +1,6 @@
 use core::fmt::Write as _;
 
 use crate::{
-    arch::device::cpu,
     context::{contexts, ContextRef, Status},
     cpu_stats::{get_context_switch_count, get_contexts_count, irq_counts},
     percpu::get_all_stats,
diff --git a/src/scheme/user.rs b/src/scheme/user.rs
index b80b456bcf..215dd8e95e 100644
--- a/src/scheme/user.rs
+++ b/src/scheme/user.rs
@@ -258,7 +258,7 @@ impl UserInner {
                         }
                     };
 
-                let mut states = self.states.lock(token.token());
+                let states = self.states.lock(token.token());
                 let (mut states, mut token) = states.into_split();
                 match states.get_mut(sqe.tag as usize) {
                     // invalid state
diff --git a/src/sync/wait_condition.rs b/src/sync/wait_condition.rs
index bda7a8cabc..c508eb64fe 100644
--- a/src/sync/wait_condition.rs
+++ b/src/sync/wait_condition.rs
@@ -6,7 +6,7 @@ use alloc::{
 };
 
 use crate::{
-    context::{self, ContextLock, PreemptGuard, PreemptGuardL1, PreemptGuardL2},
+    context::{self, ContextLock, PreemptGuardL2},
     sync::{CleanLockToken, LockToken, Mutex, L1, L2, L3},
 };