Rename FileNotFound to NotFound

Sometimes you get this error if a *directory* was not found, so it was confusing.

Author: thejpster

src/fat/volume.rs

@@ -575,7 +575,7 @@ impl FatVolume {
                             match_name,
                             block,
                         ) {
-                            Err(Error::FileNotFound) => continue,
+                            Err(Error::NotFound) => continue,
                             x => return x,
                         }
                     }
@@ -592,7 +592,7 @@ impl FatVolume {
                         current_cluster = None;
                     }
                 }
-                Err(Error::FileNotFound)
+                Err(Error::NotFound)
             }
             FatSpecificInfo::Fat32(fat32_info) => {
                 let mut current_cluster = match dir.cluster {
@@ -609,7 +609,7 @@ impl FatVolume {
                             match_name,
                             block,
                         ) {
-                            Err(Error::FileNotFound) => continue,
+                            Err(Error::NotFound) => continue,
                             x => return x,
                         }
                     }
@@ -619,7 +619,7 @@ impl FatVolume {
                             _ => None,
                         }
                 }
-                Err(Error::FileNotFound)
+                Err(Error::NotFound)
             }
         }
     }
@@ -653,7 +653,7 @@ impl FatVolume {
                 return Ok(dir_entry.get_entry(fat_type, block, start));
             }
         }
-        Err(Error::FileNotFound)
+        Err(Error::NotFound)
     }
 
     /// Delete an entry from the given directory
@@ -691,7 +691,7 @@ impl FatVolume {
                     // Scan the cluster / root dir a block at a time
                     for block in first_dir_block_num.range(dir_size) {
                         match self.delete_entry_in_block(block_device, match_name, block) {
-                            Err(Error::FileNotFound) => {
+                            Err(Error::NotFound) => {
                                 // Carry on
                             }
                             x => {
@@ -731,7 +731,7 @@ impl FatVolume {
                     let block_idx = self.cluster_to_block(cluster);
                     for block in block_idx.range(BlockCount(u32::from(self.blocks_per_cluster))) {
                         match self.delete_entry_in_block(block_device, match_name, block) {
-                            Err(Error::FileNotFound) => {
+                            Err(Error::NotFound) => {
                                 // Carry on
                                 continue;
                             }
@@ -755,7 +755,7 @@ impl FatVolume {
         }
         // If we get here we never found the right entry in any of the
         // blocks that made up the directory
-        Err(Error::FileNotFound)
+        Err(Error::NotFound)
     }
 
     /// Deletes a directory entry from a block of directory entries.
@@ -790,7 +790,7 @@ impl FatVolume {
                     .map_err(Error::DeviceError);
             }
         }
-        Err(Error::FileNotFound)
+        Err(Error::NotFound)
     }
 
     /// Finds the next free cluster after the start_cluster and before end_cluster

src/lib.rs

@@ -159,8 +159,8 @@ where
     TooManyOpenFiles,
     /// Bad handle given
     BadHandle,
-    /// That file doesn't exist
-    FileNotFound,
+    /// That file or directory doesn't exist
+    NotFound,
     /// You can't open a file twice or delete an open file
     FileAlreadyOpen,
     /// You can't open a directory twice

src/volume_mgr.rs

@@ -493,7 +493,7 @@ where
             }
             _ => {
                 // We are opening a non-existant file, and that's not OK.
-                return Err(Error::FileNotFound);
+                return Err(Error::NotFound);
             }
         };
 
@@ -905,7 +905,7 @@ where
             Ok(_entry) => {
                 return Err(Error::FileAlreadyExists);
             }
-            Err(Error::FileNotFound) => {
+            Err(Error::NotFound) => {
                 // perfect, let's make it
             }
             Err(e) => {

tests/directories.rs

@@ -316,7 +316,7 @@ fn find_dir_entry() {
 
     assert!(matches!(
         volume_mgr.find_directory_entry(root_dir, "README.TXS"),
-        Err(embedded_sdmmc::Error::FileNotFound)
+        Err(embedded_sdmmc::Error::NotFound)
     ));
 }
 
@@ -345,7 +345,7 @@ fn delete_file() {
 
     assert!(matches!(
         volume_mgr.delete_file_in_dir(root_dir, "README2.TXT"),
-        Err(embedded_sdmmc::Error::FileNotFound)
+        Err(embedded_sdmmc::Error::NotFound)
     ));
 
     volume_mgr.close_file(file).unwrap();
@@ -356,12 +356,12 @@ fn delete_file() {
 
     assert!(matches!(
         volume_mgr.delete_file_in_dir(root_dir, "README.TXT"),
-        Err(embedded_sdmmc::Error::FileNotFound)
+        Err(embedded_sdmmc::Error::NotFound)
     ));
 
     assert!(matches!(
         volume_mgr.open_file_in_dir(root_dir, "README.TXT", Mode::ReadOnly),
-        Err(embedded_sdmmc::Error::FileNotFound)
+        Err(embedded_sdmmc::Error::NotFound)
     ));
 }
 

tests/open_files.rs

@@ -67,7 +67,7 @@ fn open_files() {
 
     assert!(matches!(
         volume_mgr.open_file_in_dir(root_dir, "README.TXS", Mode::ReadOnly),
-        Err(Error::FileNotFound)
+        Err(Error::NotFound)
     ));
 
     // Create a new file