chore: cleanup

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;

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))]

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::{

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};

kernel/src/objects/frame.rs

@@ -1,9 +1,4 @@
-use super::{cap::RawCap, Cap, KernelObject};
+use crate::{arch::layout::mmap_phys_to_virt, objects::*, vspace::*};
-use crate::{
-    arch::layout::{mmap_phys_to_virt, PAGE_SIZE},
-    objects::cap::CapEntry,
-    vspace::*,
-};
 use core::fmt::Debug;
 use uapi::{
     cap::ObjectType,

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`

kernel/src/objects/null.rs

@@ -1,5 +1,4 @@
-use super::cap::RawCap;
+use crate::objects::*;
-use super::{Cap, KernelObject};
 use core::fmt::Debug;
 use uapi::cap::ObjectType;
 use utils::addr::PhysAddr;

kernel/src/objects/table.rs

@@ -1,5 +1,4 @@
-use super::{cap::RawCap, Cap, KernelObject};
+use crate::{arch::layout::mmap_phys_to_virt, objects::*, vspace::*};
-use crate::{arch::layout::mmap_phys_to_virt, vspace::*};
 use core::fmt::Debug;
 use uapi::{
     cap::ObjectType,

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;

kernel/src/objects/untyped.rs

@@ -1,7 +1,4 @@
-use super::cap::RawCap;
+use crate::objects::*;
-use super::cnode::{CNodeCap, CNodeObject};
-use super::null::NullCap;
-use super::{Cap, FrameCap, KernelObject, TableCap, TcbCap};
 use crate::vspace::MapAttr;
 use core::fmt::Debug;
 use uapi::cap::ObjectType;