tool: fix lint errors

Signed-off-by: Krishnan Winter <[email protected]>

Author: Kswin01

tool/microkit/src/elf.rs

@@ -384,14 +384,14 @@ impl ElfFile {
 
         last_addr = last_addr + (0x10000 - (last_addr % 0x10000));
 
-        return ElfSegment {
+        ElfSegment {
             name: Some(segment_name.to_string()),
             data: vec![0; size as usize],
             phys_addr: last_addr,
             virt_addr: last_addr,
             loadable: true,
             attrs: ElfSegmentAttributes::Read as u32,
-        };
+        }
     }
 
     pub fn populate_segment(&mut self, segment_name: &str, data: &[u8]) {
@@ -414,6 +414,6 @@ impl ElfFile {
                 }
             }
         }
-        return None;
+        None
     }
 }

tool/microkit/src/lib.rs

@@ -31,6 +31,12 @@ pub struct PGD {
     puds: Vec<Option<PUD>>,
 }
 
+impl Default for PGD {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl PGD {
     pub fn new() -> Self {
         PGD {
@@ -40,10 +46,10 @@ impl PGD {
 
     pub fn recurse(&mut self, mut curr_offset: u64, buffer: &mut Vec<u8>) -> u64 {
         let mut offset_table: [u64; 512] = [u64::MAX; 512];
-        for i in 0..512 {
+        for (i, entry) in offset_table.iter_mut().enumerate() {
             if let Some(pud) = &mut self.puds[i] {
                 curr_offset = pud.recurse(curr_offset, buffer);
-                offset_table[i] = curr_offset - (512 * 8);
+                *entry = curr_offset - (512 * 8);
             }
         }
 
@@ -85,7 +91,7 @@ impl PGD {
                 child_size += pud.as_ref().unwrap().get_size();
             }
         }
-        return (512 * 8) + child_size;
+        (512 * 8) + child_size
     }
 }
 
@@ -103,10 +109,10 @@ impl PUD {
 
     fn recurse(&mut self, mut curr_offset: u64, buffer: &mut Vec<u8>) -> u64 {
         let mut offset_table: [u64; 512] = [u64::MAX; 512];
-        for i in 0..512 {
+        for (i, entry) in offset_table.iter_mut().enumerate() {
             if let Some(dir) = &mut self.dirs[i] {
                 curr_offset = dir.recurse(curr_offset, buffer);
-                offset_table[i] = curr_offset - (512 * 8);
+                *entry = curr_offset - (512 * 8);
             }
         }
 
@@ -134,7 +140,7 @@ impl PUD {
                 child_size += dir.as_ref().unwrap().get_size();
             }
         }
-        return (512 * 8) + child_size;
+        (512 * 8) + child_size
     }
 }
 
@@ -158,17 +164,17 @@ impl DIR {
 
     fn recurse(&mut self, mut curr_offset: u64, buffer: &mut Vec<u8>) -> u64 {
         let mut offset_table: [u64; 512] = [u64::MAX; 512];
-        for i in 0..512 {
+         for (i, dir_entry) in offset_table.iter_mut().enumerate() {
             if let Some(entry) = &mut self.entries[i] {
                 match entry {
                     DirEntry::PageTable(x) => {
                         curr_offset = x.recurse(curr_offset, buffer);
-                        offset_table[i] = curr_offset - (512 * 8);
+                        *dir_entry = curr_offset - (512 * 8);
                     }
                     DirEntry::LargePage(x) => {
                         // curr_offset += 8;
                         // we mark the top bit to signal to the pd that this is a large page
-                        offset_table[i] = *x | (1 << 63);
+                        *dir_entry = *x | (1 << 63);
                     }
                 }
             }
@@ -208,14 +214,11 @@ impl DIR {
     fn get_size(&self) -> u64 {
         let mut child_size = 0;
         for pt in &self.entries {
-            match pt {
-                Some(DirEntry::PageTable(x)) => {
-                    child_size += x.get_size();
-                }
-                _ => {}
+            if let Some(DirEntry::PageTable(x)) = pt {
+                child_size += x.get_size();
             }
         }
-        return (512 * 8) + child_size;
+        (512 * 8) + child_size
     }
 }
 
@@ -248,7 +251,7 @@ impl PT {
     }
 
     fn get_size(&self) -> u64 {
-        return 512 * 8;
+        512 * 8
     }
 }
 

tool/microkit/src/main.rs

@@ -840,7 +840,7 @@ fn build_system(
     // protection domains
     let mut pd_elf_size = 0;
     for pd_elf in pd_elf_files.iter_mut() {
-        for r in phys_mem_regions_from_elf(&pd_elf, config.minimum_page_size) {
+        for r in phys_mem_regions_from_elf(pd_elf, config.minimum_page_size) {
             pd_elf_size += r.size();
         }
     }
@@ -2132,7 +2132,7 @@ fn build_system(
         let new_elf_seg = elf.get_segment(".table_data").unwrap();
 
         table_metadata.base_addr = new_elf_seg.virt_addr;
-        elf.write_symbol("table_metadata", &table_metadata.as_bytes())?;
+        elf.write_symbol("table_metadata", table_metadata.as_bytes())?;
     }
 
     let mut badged_irq_caps: HashMap<&ProtectionDomain, Vec<u64>> = HashMap::new();
@@ -3465,7 +3465,7 @@ fn main() -> Result<(), String> {
         cap_address_bits: 64,
         fan_out_limit: json_str_as_u64(&kernel_config_json, "RETYPE_FAN_OUT_LIMIT")?,
         hypervisor,
-        microkit_config: MicrokitConfig::from_str(args.config),
+        microkit_config: MicrokitConfig::config_from_str(args.config),
         fpu: json_str_as_bool(&kernel_config_json, "HAVE_FPU")?,
         arm_pa_size_bits,
         arm_smc,

tool/microkit/src/sel4.rs

@@ -39,7 +39,7 @@ pub enum MicrokitConfig {
 }
 
 impl MicrokitConfig {
-    pub fn from_str(string: &str) -> Self {
+    pub fn config_from_str(string: &str) -> Self {
         match string {
             "debug" => MicrokitConfig::Debug,
             "release" => MicrokitConfig::Release,