From 3e13d1ce5298ab7ddeea19599e2f9acdeb7d5e78 Mon Sep 17 00:00:00 2001
From: Paul Pan <i@0x7f.app>
Date: Sat, 15 Jun 2024 18:07:27 +0800
Subject: [PATCH] chore: cleanup

---
 kernel/src/arch/riscv/vspace/kmem.rs  | 2 +-
 kernel/src/arch/riscv/vspace/utils.rs | 2 +-
 kernel/src/objects/cap.rs             | 2 +-
 kernel/src/objects/cnode.rs           | 5 +----
 kernel/src/objects/frame.rs           | 7 +------
 kernel/src/objects/mod.rs             | 4 ++--
 kernel/src/objects/null.rs            | 3 +--
 kernel/src/objects/table.rs           | 3 +--
 kernel/src/objects/tcb.rs             | 7 +------
 kernel/src/objects/untyped.rs         | 5 +----
 10 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/kernel/src/arch/riscv/vspace/kmem.rs b/kernel/src/arch/riscv/vspace/kmem.rs
index 03dddd0..496538d 100644
--- a/kernel/src/arch/riscv/vspace/kmem.rs
+++ b/kernel/src/arch/riscv/vspace/kmem.rs
@@ -174,7 +174,7 @@ pub fn copy_kernel_pagetable(root: &CapEntry) {
     let mut root = TableCap::try_from(root).expect("Invalid vspace cap");
     let to: Table<Level0> = root.as_object_mut();
 
-    for (i, (from, to)) in from.entries.iter().zip(to.entries.iter_mut()).enumerate() {
+    for (from, to) in from.entries.iter().zip(to.entries.iter_mut()) {
         if !from.is_valid() {
             to.clear();
             continue;
diff --git a/kernel/src/arch/riscv/vspace/utils.rs b/kernel/src/arch/riscv/vspace/utils.rs
index 50f616a..afb61dd 100644
--- a/kernel/src/arch/riscv/vspace/utils.rs
+++ b/kernel/src/arch/riscv/vspace/utils.rs
@@ -12,7 +12,7 @@ pub static ALLOC_COUNT: core::sync::atomic::AtomicUsize = core::sync::atomic::At
 
 #[cfg(debug_assertions)]
 fn alloc_callback() {
-    let cnt = ALLOC_COUNT.fetch_add(1, core::sync::atomic::Ordering::SeqCst);
+    ALLOC_COUNT.fetch_add(1, core::sync::atomic::Ordering::SeqCst);
 }
 
 #[cfg_attr(debug_assertions, tracer::trace_callback(log = true, callback = alloc_callback))]
diff --git a/kernel/src/objects/cap.rs b/kernel/src/objects/cap.rs
index 702dc1f..655e830 100644
--- a/kernel/src/objects/cap.rs
+++ b/kernel/src/objects/cap.rs
@@ -1,6 +1,6 @@
 use crate::objects::*;
 use core::cell::Cell;
-use core::fmt::{write, Debug};
+use core::fmt::Debug;
 use uapi::cap::ObjectType;
 use utils::addr::PhysAddr;
 use utils::{
diff --git a/kernel/src/objects/cnode.rs b/kernel/src/objects/cnode.rs
index 0217469..d8668c9 100644
--- a/kernel/src/objects/cnode.rs
+++ b/kernel/src/objects/cnode.rs
@@ -1,8 +1,5 @@
-use super::{
-    cap::{CapEntry, RawCap},
-    Cap, KernelObject,
-};
 use crate::arch::layout::mmap_phys_to_virt;
+use crate::objects::*;
 use core::fmt::Debug;
 use uapi::{cap::ObjectType, fault::LookupFailure};
 use utils::addr::{AddressOps, PhysAddr};
diff --git a/kernel/src/objects/frame.rs b/kernel/src/objects/frame.rs
index 2532f44..d55e13d 100644
--- a/kernel/src/objects/frame.rs
+++ b/kernel/src/objects/frame.rs
@@ -1,9 +1,4 @@
-use super::{cap::RawCap, Cap, KernelObject};
-use crate::{
-    arch::layout::{mmap_phys_to_virt, PAGE_SIZE},
-    objects::cap::CapEntry,
-    vspace::*,
-};
+use crate::{arch::layout::mmap_phys_to_virt, objects::*, vspace::*};
 use core::fmt::Debug;
 use uapi::{
     cap::ObjectType,
diff --git a/kernel/src/objects/mod.rs b/kernel/src/objects/mod.rs
index 34b55d5..577d218 100644
--- a/kernel/src/objects/mod.rs
+++ b/kernel/src/objects/mod.rs
@@ -31,10 +31,10 @@ pub mod untyped;
 pub use cap::{CapEntry, RawCap};
 pub use cnode::{CNodeCap, CNodeObject};
 pub use frame::{FrameCap, FrameObject};
-pub use null::{NullCap, NullObject};
+pub use null::NullCap;
 pub use table::{TableCap, TableObject};
 pub use tcb::{TcbCap, TcbObject};
-pub use untyped::{UntypedCap, UntypedObject};
+pub use untyped::UntypedCap;
 
 /// Cap is the high-level wrapper of RawCap, it's a typed reference to RawCap (which is untyped in Rust)
 /// For the typed objects, we should bound it with an empty traits `KernelObject`
diff --git a/kernel/src/objects/null.rs b/kernel/src/objects/null.rs
index 8a573e9..8b35e07 100644
--- a/kernel/src/objects/null.rs
+++ b/kernel/src/objects/null.rs
@@ -1,5 +1,4 @@
-use super::cap::RawCap;
-use super::{Cap, KernelObject};
+use crate::objects::*;
 use core::fmt::Debug;
 use uapi::cap::ObjectType;
 use utils::addr::PhysAddr;
diff --git a/kernel/src/objects/table.rs b/kernel/src/objects/table.rs
index 02e1cf7..f200058 100644
--- a/kernel/src/objects/table.rs
+++ b/kernel/src/objects/table.rs
@@ -1,5 +1,4 @@
-use super::{cap::RawCap, Cap, KernelObject};
-use crate::{arch::layout::mmap_phys_to_virt, vspace::*};
+use crate::{arch::layout::mmap_phys_to_virt, objects::*, vspace::*};
 use core::fmt::Debug;
 use uapi::{
     cap::ObjectType,
diff --git a/kernel/src/objects/tcb.rs b/kernel/src/objects/tcb.rs
index affdb46..0c16f40 100644
--- a/kernel/src/objects/tcb.rs
+++ b/kernel/src/objects/tcb.rs
@@ -1,11 +1,6 @@
-use super::{
-    cap::{CapEntry, RawCap},
-    cnode::CNodeCap,
-    null::NullCap,
-    Cap, KernelObject,
-};
 use crate::{
     arch::{layout::mmap_phys_to_virt, trap::TrapContext},
+    objects::*,
     plat::trap::TrapContextOps,
 };
 use core::fmt::Debug;
diff --git a/kernel/src/objects/untyped.rs b/kernel/src/objects/untyped.rs
index ebbae98..aee13c9 100644
--- a/kernel/src/objects/untyped.rs
+++ b/kernel/src/objects/untyped.rs
@@ -1,7 +1,4 @@
-use super::cap::RawCap;
-use super::cnode::{CNodeCap, CNodeObject};
-use super::null::NullCap;
-use super::{Cap, FrameCap, KernelObject, TableCap, TcbCap};
+use crate::objects::*;
 use crate::vspace::MapAttr;
 use core::fmt::Debug;
 use uapi::cap::ObjectType;