vexos: use io::const_error! where applicable

Author: tropicaaal

library/std/src/sys/fs/vexos.rs

@@ -66,7 +66,7 @@ impl FileAttr {
         if let Ok(size) = u64::try_from(unsafe { vex_sdk::vexFileSize(fd) }) {
             Ok(Self::File { size })
         } else {
-            Err(io::Error::new(io::ErrorKind::InvalidData, "Failed to get file size"))
+            Err(io::const_error!(io::ErrorKind::InvalidData, "Failed to get file size"))
         }
     }
 
@@ -213,7 +213,7 @@ impl File {
             let file = match opts {
                 // read + write - unsupported
                 OpenOptions { read: true, write: true, .. } => {
-                    return Err(io::Error::new(
+                    return Err(io::const_error!(
                         io::ErrorKind::InvalidInput,
                         "Opening files with read and write access is unsupported on this target",
                     ));
@@ -240,14 +240,14 @@ impl File {
                 } => unsafe {
                     if *create_new {
                         if vex_sdk::vexFileStatus(path.as_ptr()) != 0 {
-                            return Err(io::Error::new(
+                            return Err(io::const_error!(
                                 io::ErrorKind::AlreadyExists,
                                 "File exists",
                             ));
                         }
                     } else if !*create {
                         if vex_sdk::vexFileStatus(path.as_ptr()) == 0 {
-                            return Err(io::Error::new(
+                            return Err(io::const_error!(
                                 io::ErrorKind::NotFound,
                                 "No such file or directory",
                             ));
@@ -268,14 +268,14 @@ impl File {
                 } => unsafe {
                     if *create_new {
                         if vex_sdk::vexFileStatus(path.as_ptr()) != 0 {
-                            return Err(io::Error::new(
+                            return Err(io::const_error!(
                                 io::ErrorKind::AlreadyExists,
                                 "File exists",
                             ));
                         }
                     } else if !*create {
                         if vex_sdk::vexFileStatus(path.as_ptr()) == 0 {
-                            return Err(io::Error::new(
+                            return Err(io::const_error!(
                                 io::ErrorKind::NotFound,
                                 "No such file or directory",
                             ));
@@ -293,12 +293,12 @@ impl File {
                 },
 
                 _ => {
-                    return Err(io::Error::new(io::ErrorKind::InvalidInput, "Invalid argument"));
+                    return Err(io::const_error!(io::ErrorKind::InvalidInput, "Invalid argument"));
                 }
             };
 
             if file.is_null() {
-                Err(io::Error::new(io::ErrorKind::NotFound, "Could not open file"))
+                Err(io::const_error!(io::ErrorKind::NotFound, "Could not open file"))
             } else {
                 Ok(Self { fd: FileDesc(file) })
             }
@@ -347,7 +347,7 @@ impl File {
         let read = unsafe { vex_sdk::vexFileRead(buf_ptr.cast(), 1, len, self.fd.0) };
 
         if read < 0 {
-            Err(io::Error::new(io::ErrorKind::Other, "Could not read from file"))
+            Err(io::const_error!(io::ErrorKind::Other, "Could not read from file"))
         } else {
             Ok(read as usize)
         }
@@ -373,7 +373,7 @@ impl File {
             unsafe { vex_sdk::vexFileWrite(buf_ptr.cast_mut().cast(), 1, len as _, self.fd.0) };
 
         if written < 0 {
-            Err(io::Error::new(io::ErrorKind::Other, "Could not write to file"))
+            Err(io::const_error!(io::ErrorKind::Other, "Could not write to file"))
         } else {
             Ok(written as usize)
         }
@@ -399,7 +399,7 @@ impl File {
         let position = unsafe { vex_sdk::vexFileTell(self.fd.0) };
 
         position.try_into().map_err(|_| {
-            io::Error::new(io::ErrorKind::InvalidData, "Failed to get current location in file")
+            io::const_error!(io::ErrorKind::InvalidData, "Failed to get current location in file")
         })
     }
 
@@ -414,7 +414,7 @@ impl File {
 
         fn try_convert_offset<T: TryInto<u32>>(offset: T) -> io::Result<u32> {
             offset.try_into().map_err(|_| {
-                io::Error::new(
+                io::const_error!(
                     io::ErrorKind::InvalidInput,
                     "Cannot seek to an offset too large to fit in a 32 bit integer",
                 )
@@ -529,77 +529,79 @@ fn map_fresult(fresult: vex_sdk::FRESULT) -> io::Result<()> {
     // VEX uses a derivative of FatFs (Xilinx's xilffs library) for filesystem operations.
     match fresult {
         vex_sdk::FRESULT::FR_OK => Ok(()),
-        vex_sdk::FRESULT::FR_DISK_ERR => Err(io::Error::new(
+        vex_sdk::FRESULT::FR_DISK_ERR => Err(io::const_error!(
             io::ErrorKind::Uncategorized,
             "internal function reported an unrecoverable hard error",
         )),
-        vex_sdk::FRESULT::FR_INT_ERR => Err(io::Error::new(
+        vex_sdk::FRESULT::FR_INT_ERR => Err(io::const_error!(
             io::ErrorKind::Uncategorized,
             "internal error in filesystem runtime",
         )),
-        vex_sdk::FRESULT::FR_NOT_READY => Err(io::Error::new(
+        vex_sdk::FRESULT::FR_NOT_READY => Err(io::const_error!(
             io::ErrorKind::Uncategorized,
             "the storage device could not be prepared to work",
         )),
-        vex_sdk::FRESULT::FR_NO_FILE => {
-            Err(io::Error::new(io::ErrorKind::NotFound, "could not find the file in the directory"))
-        }
-        vex_sdk::FRESULT::FR_NO_PATH => Err(io::Error::new(
+        vex_sdk::FRESULT::FR_NO_FILE => Err(io::const_error!(
+            io::ErrorKind::NotFound,
+            "could not find the file in the directory"
+        )),
+        vex_sdk::FRESULT::FR_NO_PATH => Err(io::const_error!(
             io::ErrorKind::NotFound,
             "a directory in the path name could not be found",
         )),
-        vex_sdk::FRESULT::FR_INVALID_NAME => Err(io::Error::new(
+        vex_sdk::FRESULT::FR_INVALID_NAME => Err(io::const_error!(
             io::ErrorKind::InvalidInput,
             "the given string is invalid as a path name",
         )),
-        vex_sdk::FRESULT::FR_DENIED => Err(io::Error::new(
+        vex_sdk::FRESULT::FR_DENIED => Err(io::const_error!(
             io::ErrorKind::PermissionDenied,
             "the required access for this operation was denied",
         )),
-        vex_sdk::FRESULT::FR_EXIST => Err(io::Error::new(
+        vex_sdk::FRESULT::FR_EXIST => Err(io::const_error!(
             io::ErrorKind::AlreadyExists,
             "an object with the same name already exists in the directory",
         )),
-        vex_sdk::FRESULT::FR_INVALID_OBJECT => Err(io::Error::new(
+        vex_sdk::FRESULT::FR_INVALID_OBJECT => Err(io::const_error!(
             io::ErrorKind::Uncategorized,
             "invalid or null file/directory object",
         )),
-        vex_sdk::FRESULT::FR_WRITE_PROTECTED => Err(io::Error::new(
+        vex_sdk::FRESULT::FR_WRITE_PROTECTED => Err(io::const_error!(
             io::ErrorKind::PermissionDenied,
             "a write operation was performed on write-protected media",
         )),
-        vex_sdk::FRESULT::FR_INVALID_DRIVE => Err(io::Error::new(
+        vex_sdk::FRESULT::FR_INVALID_DRIVE => Err(io::const_error!(
             io::ErrorKind::InvalidInput,
             "an invalid drive number was specified in the path name",
         )),
-        vex_sdk::FRESULT::FR_NOT_ENABLED => Err(io::Error::new(
+        vex_sdk::FRESULT::FR_NOT_ENABLED => Err(io::const_error!(
             io::ErrorKind::Uncategorized,
             "work area for the logical drive has not been registered",
         )),
-        vex_sdk::FRESULT::FR_NO_FILESYSTEM => Err(io::Error::new(
+        vex_sdk::FRESULT::FR_NO_FILESYSTEM => Err(io::const_error!(
             io::ErrorKind::Uncategorized,
             "valid FAT volume could not be found on the drive",
         )),
-        vex_sdk::FRESULT::FR_MKFS_ABORTED => {
-            Err(io::Error::new(io::ErrorKind::Uncategorized, "failed to create filesystem volume"))
-        }
-        vex_sdk::FRESULT::FR_TIMEOUT => Err(io::Error::new(
+        vex_sdk::FRESULT::FR_MKFS_ABORTED => Err(io::const_error!(
+            io::ErrorKind::Uncategorized,
+            "failed to create filesystem volume"
+        )),
+        vex_sdk::FRESULT::FR_TIMEOUT => Err(io::const_error!(
             io::ErrorKind::TimedOut,
             "the function was canceled due to a timeout of thread-safe control",
         )),
-        vex_sdk::FRESULT::FR_LOCKED => Err(io::Error::new(
+        vex_sdk::FRESULT::FR_LOCKED => Err(io::const_error!(
             io::ErrorKind::Uncategorized,
             "the operation to the object was rejected by file sharing control",
         )),
         vex_sdk::FRESULT::FR_NOT_ENOUGH_CORE => {
-            Err(io::Error::new(io::ErrorKind::OutOfMemory, "not enough memory for the operation"))
+            Err(io::const_error!(io::ErrorKind::OutOfMemory, "not enough memory for the operation"))
         }
-        vex_sdk::FRESULT::FR_TOO_MANY_OPEN_FILES => Err(io::Error::new(
+        vex_sdk::FRESULT::FR_TOO_MANY_OPEN_FILES => Err(io::const_error!(
             io::ErrorKind::Uncategorized,
             "maximum number of open files has been reached",
         )),
         vex_sdk::FRESULT::FR_INVALID_PARAMETER => {
-            Err(io::Error::new(io::ErrorKind::InvalidInput, "a given parameter was invalid"))
+            Err(io::const_error!(io::ErrorKind::InvalidInput, "a given parameter was invalid"))
         }
         _ => unreachable!(), // C-style enum
     }

library/std/src/sys/stdio/vexos.rs

@@ -59,7 +59,7 @@ impl io::Write for Stdout {
             }
             .try_into()
             .map_err(|_| {
-                io::Error::new(io::ErrorKind::Uncategorized, "Internal write error occurred.")
+                io::const_error!(io::ErrorKind::Uncategorized, "Internal write error occurred.")
             })?;
 
             written += count;