FP-style seeking

hfo2/src/api.rs

@@ -584,7 +584,7 @@ pub unsafe extern "C" fn api_spci_msg_send(
         // at spci_msg_handle_architected_message will make several accesses to
         // fields in message_buffer. The memory area message_buffer must be
         // exclusively owned by Hf so that TOCTOU issues do not arise.
-        // TODO(HfO2): Refactor `spci_*` functions, in order to pass references 
+        // TODO(HfO2): Refactor `spci_*` functions, in order to pass references
         // to VmInner.
         let ret = spci_msg_handle_architected_message(
             &ManuallyDrop::new(VmLocked::from_raw(to as *const _ as usize as *mut _)),

hfo2/src/fdt.rs

@@ -107,7 +107,9 @@ impl FdtTokenizer {
     }
 
     unsafe fn iter(&self) -> impl Iterator<Item = *const u8> {
-        slice::from_raw_parts(self.cur, self.end.offset_from(self.cur) as usize).iter().map(|p| p as *const u8)
+        slice::from_raw_parts(self.cur, self.end.offset_from(self.cur) as usize)
+            .iter()
+            .map(|p| p as *const u8)
     }
 
     unsafe fn u32(&mut self) -> Option<u32> {
@@ -147,14 +149,12 @@ impl FdtTokenizer {
     }
 
     unsafe fn str(&mut self) -> Option<*const u8> {
-        for p in self.iter() {
-            if *p == 0 {
-                // Found the end of the string.
-                let res = self.cur;
-                self.cur = p.add(1);
-                self.align();
-                return Some(res);
-            }
+        if let Some(p) = self.iter().find(|p| **p == 0) {
+            // Found the end of the string.
+            let res = self.cur;
+            self.cur = p.add(1);
+            self.align();
+            return Some(res);
         }
 
         None