kernel: more cleanup

Signed-off-by: Anhad Singh <[email protected]>

Author: Andy-Python-Programmer

src/aero_kernel/src/drivers/block/ide/mod.rs

@@ -197,11 +197,10 @@ struct Ide {
 
 impl PciDeviceHandle for Ide {
     fn handles(&self, vendor_id: Vendor, device_id: DeviceType) -> bool {
-        match (vendor_id, device_id) {
-            (Vendor::Intel, DeviceType::IdeController) => true,
-
-            _ => false,
-        }
+        matches!(
+            (vendor_id, device_id),
+            (Vendor::Intel, DeviceType::IdeController)
+        )
     }
 
     fn start(&self, header: &PciHeader, _offset_table: &mut OffsetPageTable) {

src/aero_kernel/src/fs/block/mod.rs

@@ -373,7 +373,7 @@ impl BlockDeviceInterface for PartitionBlockDevice {
             return None;
         }
 
-        self.write_dma(self.offset + sector, start, size)
+        self.device.write_dma(self.offset + sector, start, size)
     }
 
     fn read_dma(&self, sector: usize, start: PhysAddr, size: usize) -> Option<usize> {

src/aero_kernel/src/fs/file_table.rs

@@ -192,10 +192,8 @@ impl FileTable {
     pub fn get_handle(&self, fd: usize) -> Option<Arc<FileHandle>> {
         let files = self.0.read();
 
-        if let Some(file) = &files.get(fd) {
-            if let Some(handle) = file {
-                return Some(handle.clone());
-            }
+        if let Some(Some(handle)) = &files.get(fd) {
+            return Some(handle.clone());
         }
 
         None
@@ -204,14 +202,12 @@ impl FileTable {
     pub fn log(&self) {
         let files = self.0.read();
 
-        for handle in files.iter() {
-            if let Some(handle) = handle {
-                log::debug!(
-                    "file handle: (fd={}, path=`{}`)",
-                    handle.fd,
-                    handle.inode.absolute_path_str()
-                )
-            }
+        for handle in files.iter().flatten() {
+            log::debug!(
+                "file handle: (fd={}, path=`{}`)",
+                handle.fd,
+                handle.inode.absolute_path_str()
+            )
         }
     }
 
@@ -297,16 +293,14 @@ impl FileTable {
     pub fn deep_clone(&self) -> Self {
         let files = self.0.read();
 
-        for file in files.iter() {
-            if let Some(handle) = file {
-                let flags = *handle.flags.read();
+        for handle in files.iter().flatten() {
+            let flags = *handle.flags.read();
 
-                handle
-                    .inode
-                    .inode()
-                    .open(flags, handle.clone())
-                    .expect("FileTable::clone: failed to open file");
-            }
+            handle
+                .inode
+                .inode()
+                .open(flags, handle.clone())
+                .expect("FileTable::clone: failed to open file");
         }
 
         Self(RwLock::new(files.clone()))

src/aero_kernel/src/fs/pipe.rs

@@ -106,10 +106,10 @@ impl INodeInterface for Pipe {
     }
 
     fn poll(&self, table: Option<&mut PollTable>) -> super::Result<PollFlags> {
-        table.map(|e| {
-            e.insert(&self.readers);
-            e.insert(&self.writers)
-        });
+        if let Some(table) = table {
+            table.insert(&self.readers);
+            table.insert(&self.writers);
+        }
 
         let mut flags = PollFlags::OUT;
 

src/aero_kernel/src/fs/procfs.rs

@@ -46,34 +46,35 @@ fn get_cpuinfo_cached() -> &'static str {
 
         let mut data = json!({ "processors": [] });
 
-        data.get_mut("processors")
+        if let Some(processors) = data
+            .get_mut("processors")
             .and_then(|processors| processors.as_array_mut())
-            .map(|processors| {
-                let mut cpu_info = vec![];
+        {
+            let mut cpu_info = vec![];
 
-                #[cfg(target_arch = "x86_64")]
-                tls::for_cpu_info_cached(|info| {
-                    let mut processor = json!({});
+            #[cfg(target_arch = "x86_64")]
+            tls::for_cpu_info_cached(|info| {
+                let mut processor = json!({});
 
-                    processor["id"] = Value::Number(Number::from(info.cpuid));
-                    processor["fpu"] = Value::Bool(info.fpu);
+                processor["id"] = Value::Number(Number::from(info.cpuid));
+                processor["fpu"] = Value::Bool(info.fpu);
 
-                    push_string_if_some(&mut processor, "brand", info.brand.clone());
-                    push_string_if_some(&mut processor, "vendor", info.vendor.clone());
+                push_string_if_some(&mut processor, "brand", info.brand.clone());
+                push_string_if_some(&mut processor, "vendor", info.vendor.clone());
 
-                    processor["features"] = Value::Array(
-                        info.features
-                            .iter()
-                            .map(|feature| Value::String(feature.to_string()))
-                            .collect(),
-                    );
+                processor["features"] = Value::Array(
+                    info.features
+                        .iter()
+                        .map(|feature| Value::String(feature.to_string()))
+                        .collect(),
+                );
 
-                    cpu_info.push(processor);
-                });
-
-                *processors = cpu_info;
+                cpu_info.push(processor);
             });
 
+            *processors = cpu_info;
+        }
+
         data.to_string()
     })
 }

src/aero_kernel/src/fs/ramfs.rs

@@ -236,7 +236,7 @@ impl INodeInterface for LockedRamINode {
     fn unlink(&self, name: &str) -> Result<()> {
         let mut this = self.0.write();
 
-        if let Some(_) = this.children.remove(name) {
+        if this.children.remove(name).is_some() {
             Ok(())
         } else {
             Err(FileSystemError::EntryNotFound)
@@ -445,7 +445,7 @@ impl INodeInterface for LockedRamINode {
         {
             let this = self.0.read();
 
-            if this.children.iter().any(|(e, _)| e == &name) {
+            if this.children.iter().any(|(e, _)| e == name) {
                 return Err(FileSystemError::EntryExists);
             }
         }

src/aero_kernel/src/modules.rs

@@ -45,7 +45,7 @@ pub enum ModuleType {
 #[derive(Debug)]
 #[repr(C)]
 pub struct Module {
-    pub init: *const fn() -> (),
+    pub init: *const (),
     pub ty: ModuleType,
 }
 
@@ -59,7 +59,7 @@ macro_rules! module_init {
         #[used]
         #[link_section = ".kernel_modules.init"]
         static __MODULE_INIT: $crate::modules::Module = $crate::modules::Module {
-            init: $init_function as *const fn() -> (),
+            init: $init_function as *const (),
             ty: $ty,
         };
     };
@@ -102,7 +102,7 @@ pub(crate) fn init() {
                 launched_fs = true;
             }
 
-            let init = core::mem::transmute::<*const fn() -> (), fn() -> ()>(module.init);
+            let init = core::mem::transmute::<*const (), fn() -> ()>(module.init);
             init();
         }
     }

src/aero_kernel/src/userland/scheduler/round_robin.rs

@@ -123,7 +123,7 @@ impl RoundRobin {
             self.await_io().unwrap();
         } else if let Some(task) = queue.dead.pop_front() {
             task.update_state(TaskState::Zombie);
-            task.into_zombie();
+            task.make_zombie();
         }
     }
 

src/aero_kernel/src/userland/signals.rs

@@ -158,7 +158,7 @@ impl SignalEntry {
         })
     }
 
-    pub fn into_sigaction(&self) -> SigAction {
+    pub fn sigaction(&self) -> SigAction {
         let handler: usize = self.handler.into();
 
         SigAction {
@@ -369,7 +369,7 @@ impl Signals {
         let mut signals = self.entries();
 
         if let Some(old) = old {
-            *old = signals[signal].into_sigaction();
+            *old = signals[signal].sigaction();
         }
 
         if let Some(handler) = handler {

src/aero_kernel/src/userland/task/mod.rs

@@ -657,7 +657,7 @@ impl Task {
         }
     }
 
-    pub(super) fn into_zombie(&self) {
+    pub(super) fn make_zombie(&self) {
         self.detach();
         self.arch_task_mut().dealloc();