Minor refactor

Author: jbeaurivage

src/filesystem/search_id.rs

@@ -1,3 +1,5 @@
+use core::num::Wrapping;
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "defmt-log", derive(defmt::Format))]
 /// Unique ID used to search for files and directories in the open File/Directory lists
@@ -7,19 +9,21 @@ pub struct SearchId(pub(crate) u32);
 ///
 /// This object will always return a different ID.
 pub struct IdGenerator {
-    next_id: u32,
+    next_id: Wrapping<u32>,
 }
 
 impl IdGenerator {
     /// Create a new [`IdGenerator`].
     pub const fn new() -> Self {
-        Self { next_id: 0 }
+        Self {
+            next_id: Wrapping(0),
+        }
     }
 
     /// Generate a new, unique [`SearchId`].
     pub fn get(&mut self) -> SearchId {
         let id = self.next_id;
-        self.next_id = self.next_id.wrapping_add(1);
-        SearchId(id)
+        self.next_id += 1;
+        SearchId(id.0)
     }
 }

src/volume_mgr.rs

@@ -737,16 +737,20 @@ where
     }
 }
 
-fn cluster_position_by_id(list: &[ClusterDescriptor], id_to_find: SearchId) -> Option<usize> {
-    list.iter().position(|f| f.compare_id(id_to_find))
+fn cluster_position_by_id(
+    cluster_list: &[ClusterDescriptor],
+    id_to_find: SearchId,
+) -> Option<usize> {
+    cluster_list.iter().position(|f| f.compare_id(id_to_find))
 }
 
 fn cluster_already_open(
-    vec: &[ClusterDescriptor],
+    cluster_list: &[ClusterDescriptor],
     volume_idx: VolumeIdx,
     cluster: Cluster,
 ) -> bool {
-    vec.iter()
+    cluster_list
+        .iter()
         .any(|d| d.compare_volume_and_cluster(volume_idx, cluster))
 }