a

Author: phip1611

uefi-test-runner/src/fs/mod.rs

@@ -2,14 +2,15 @@
 
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
-use uefi::fs::{FileSystem, FileSystemError, FileSystemIOError, FileSystemIOErrorContext, PathBuf};
+use uefi::fs;
+use uefi::fs::{FileSystem, FileSystemIOErrorContext, IOError, PathBuf};
 use uefi::proto::media::fs::SimpleFileSystem;
 use uefi::table::boot::ScopedProtocol;
-use uefi::{cstr16, Error, Status};
+use uefi::{cstr16, Status};
 
 /// Tests functionality from the `uefi::fs` module. This test relies on a
 /// working File System Protocol, which is tested at a dedicated place.
-pub fn test(sfs: ScopedProtocol<SimpleFileSystem>) -> Result<(), FileSystemError> {
+pub fn test(sfs: ScopedProtocol<SimpleFileSystem>) -> Result<(), fs::Error> {
     let mut fs = FileSystem::new(sfs);
 
     // test create dir
@@ -26,10 +27,10 @@ pub fn test(sfs: ScopedProtocol<SimpleFileSystem>) -> Result<(), FileSystemError
 
     // test copy from non-existent file: does the error type work as expected?
     let err = fs.copy(cstr16!("not_found"), cstr16!("abc"));
-    let expected_err = FileSystemError::IO(FileSystemIOError {
+    let expected_err = uefi::Error::IO(IOError {
         path: PathBuf::from(cstr16!("not_found")),
         context: FileSystemIOErrorContext::OpenError,
-        uefi_error: Error::new(Status::NOT_FOUND, ()),
+        uefi_error: uefi::Error::new(Status::NOT_FOUND, ()),
     });
     assert_eq!(err, Err(expected_err));
 

uefi/src/fs/file_system/error.rs

@@ -7,11 +7,11 @@ use derive_more::Display;
 ///
 /// [`FileSystem`]: super::FileSystem
 #[derive(Debug, Clone, Display, PartialEq, Eq)]
-pub enum FileSystemError {
+pub enum Error {
     /// Logical errors. See [`LogicError`].
     Logic(LogicError),
-    /// IO (low-level UEFI-errors) errors. See [`FileSystemIOError`].
-    IO(FileSystemIOError),
+    /// IO (low-level UEFI-errors) errors. See [`IOError`].
+    IO(IOError),
     /// Path-related errors. See [`PathError`].
     Path(PathError),
     /// Can't parse file content as UTF-8. See [`FromUtf8Error`].
@@ -21,7 +21,7 @@ pub enum FileSystemError {
 /// UEFI-error with context when working with the underlying UEFI file protocol.
 #[derive(Debug, Clone, Display, PartialEq, Eq)]
 #[display(fmt = "FileSystemIOError({},{})", context, path)]
-pub struct FileSystemIOError {
+pub struct IOError {
     /// The path that led to the error.
     pub path: PathBuf,
     /// The context in which the path was used.
@@ -41,7 +41,7 @@ pub enum LogicError {
     NotAFile(PathBuf),
 }
 
-/// Enum that further specifies the context in that a [`FileSystemError`]
+/// Enum that further specifies the context in that a [`Error`]
 /// occurred.
 #[derive(Debug, Clone, Display, PartialEq, Eq)]
 pub enum FileSystemIOErrorContext {
@@ -64,26 +64,26 @@ pub enum FileSystemIOErrorContext {
     WriteFailure,
 }
 
-impl From<PathError> for FileSystemError {
+impl From<PathError> for Error {
     fn from(value: PathError) -> Self {
         Self::Path(value)
     }
 }
 
 #[cfg(feature = "unstable")]
-impl core::error::Error for FileSystemError {
+impl core::error::Error for Error {
     fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
         match self {
-            FileSystemError::IO(err) => Some(err),
-            FileSystemError::Path(err) => Some(err),
-            FileSystemError::Utf8Encoding(err) => Some(err),
-            FileSystemError::Logic(err) => Some(err),
+            Error::IO(err) => Some(err),
+            Error::Path(err) => Some(err),
+            Error::Utf8Encoding(err) => Some(err),
+            Error::Logic(err) => Some(err),
         }
     }
 }
 
 #[cfg(feature = "unstable")]
-impl core::error::Error for FileSystemIOError {
+impl core::error::Error for IOError {
     fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
         Some(&self.uefi_error)
     }