tool: succumb to clippy

Ivan-Velickovic · Ivan-Velickovic · commit c4d8d1965dc4 · 2025-10-30T12:52:25.000+11:00
Signed-off-by: Ivan Velickovic &lt;i.velickovic@unsw.edu.au&gt;
diff --git a/tool/microkit/src/loader.rs b/tool/microkit/src/loader.rs
@@ -171,10 +171,12 @@ impl<'a> Loader<'a> {
                     kernel_first_paddr = Some(segment.phys_addr);
                 }
 
-                if kernel_p_v_offset.is_none() {
+                if let Some(p_v_offset) = kernel_p_v_offset {
+                    if p_v_offset != segment.virt_addr - segment.phys_addr {
+                        panic!("Kernel does not have a consistent physical to virtual offset");
+                    }
+                } else {
                     kernel_p_v_offset = Some(segment.virt_addr - segment.phys_addr);
-                } else if kernel_p_v_offset.unwrap() != segment.virt_addr - segment.phys_addr {
-                    panic!("Kernel does not have a consistent physical to virtual offset");
                 }
 
                 regions.push((segment.phys_addr, segment.data().as_slice()));

Original file line number	Diff line number	Diff line change
`@@ -171,10 +171,12 @@ impl<'a> Loader<'a> {`
`171`	`171`	`kernel_first_paddr = Some(segment.phys_addr);`
`172`	`172`	`}`
`173`	`173`
`174`		`- if kernel_p_v_offset.is_none() {`
	`174`	`+ if let Some(p_v_offset) = kernel_p_v_offset {`
	`175`	`+ if p_v_offset != segment.virt_addr - segment.phys_addr {`
	`176`	`+ panic!("Kernel does not have a consistent physical to virtual offset");`
	`177`	`+ }`
	`178`	`+ } else {`
`175`	`179`	`kernel_p_v_offset = Some(segment.virt_addr - segment.phys_addr);`
`176`		`- } else if kernel_p_v_offset.unwrap() != segment.virt_addr - segment.phys_addr {`
`177`		`- panic!("Kernel does not have a consistent physical to virtual offset");`
`178`	`180`	`}`
`179`	`181`
`180`	`182`	`regions.push((segment.phys_addr, segment.data().as_slice()));`