fix type incompatibilities from unsupported re-exports

Author: Tropix126

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

@@ -11,10 +11,9 @@ use crate::sys::{unsupported, unsupported_err};
 #[expect(dead_code)]
 #[path = "unsupported.rs"]
 mod unsupported_fs;
-
 pub use unsupported_fs::{
-    DirBuilder, FilePermissions, FileTimes, ReadDir, canonicalize, link, remove_dir_all, rename,
-    rmdir, set_perm, symlink, unlink,
+    DirBuilder, FileTimes, canonicalize, link, readlink, remove_dir_all, rename, rmdir, symlink,
+    unlink,
 };
 
 #[derive(Debug)]
@@ -30,6 +29,8 @@ pub enum FileAttr {
     File { size: u64 },
 }
 
+pub struct ReadDir(!);
+
 pub struct DirEntry {
     path: PathBuf,
 }
@@ -44,6 +45,9 @@ pub struct OpenOptions {
     create_new: bool,
 }
 
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub struct FilePermissions {}
+
 #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
 pub struct FileType {
     is_dir: bool,
@@ -108,6 +112,16 @@ impl FileAttr {
     }
 }
 
+impl FilePermissions {
+    pub fn readonly(&self) -> bool {
+        false
+    }
+
+    pub fn set_readonly(&mut self, _readonly: bool) {
+        panic!("Perimissions do not exist")
+    }
+}
+
 impl FileType {
     pub fn is_dir(&self) -> bool {
         self.is_dir
@@ -123,6 +137,38 @@ impl FileType {
     }
 }
 
+impl fmt::Debug for ReadDir {
+    fn fmt(&self, _f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.0
+    }
+}
+
+impl Iterator for ReadDir {
+    type Item = io::Result<DirEntry>;
+
+    fn next(&mut self) -> Option<io::Result<DirEntry>> {
+        self.0
+    }
+}
+
+impl DirEntry {
+    pub fn path(&self) -> PathBuf {
+        self.path.clone()
+    }
+
+    pub fn file_name(&self) -> OsString {
+        self.path.file_name().unwrap_or_default().into()
+    }
+
+    pub fn metadata(&self) -> io::Result<FileAttr> {
+        stat(&self.path)
+    }
+
+    pub fn file_type(&self) -> io::Result<FileType> {
+        Ok(self.metadata()?.file_type())
+    }
+}
+
 impl OpenOptions {
     pub fn new() -> OpenOptions {
         OpenOptions {
@@ -436,6 +482,21 @@ impl Drop for File {
     }
 }
 
+pub fn readdir(_p: &Path) -> io::Result<ReadDir> {
+    // While there *is* a userspace function for reading file directories,
+    // the necessary implementation cannot currently be done cleanly, as
+    // VEXos does not expose directory length to user programs.
+    //
+    // This means that we would need to create a large fixed-length buffer
+    // and hope that the folder's contents didn't exceed that buffer's length,
+    // which obviously isn't behavior we want to rely on in the standard library.
+    unsupported()
+}
+
+pub fn set_perm(_p: &Path, _perm: FilePermissions) -> io::Result<()> {
+    unsupported()
+}
+
 pub fn exists(path: &Path) -> io::Result<bool> {
     run_path_with_cstr(path, &|path| Ok(unsafe { vex_sdk::vexFileStatus(path.as_ptr()) } != 0))
 }

library/std/src/sys/pal/vexos/thread.rs

@@ -1,15 +1,14 @@
-#[expect(dead_code)]
-#[path = "unsupported.rs"]
-mod unsupported_thread;
-
-pub use unsupported_thread::{DEFAULT_MIN_STACK_SIZE, available_parallelism, current_os_id};
-
 use super::unsupported;
 use crate::ffi::CStr;
 use crate::io;
 use crate::num::NonZero;
 use crate::time::{Duration, Instant};
 
+#[expect(dead_code)]
+#[path = "../unsupported/thread.rs"]
+mod unsupported_thread;
+pub use unsupported_thread::{DEFAULT_MIN_STACK_SIZE, available_parallelism};
+
 pub struct Thread(!);
 
 impl Thread {
@@ -54,3 +53,7 @@ impl Thread {
         self.0
     }
 }
+
+pub(crate) fn current_os_id() -> Option<u64> {
+    None
+}

library/std/src/sys/pal/vexos/time.rs

@@ -1,11 +1,10 @@
+use crate::time::Duration;
+
 #[expect(dead_code)]
-#[path = "unsupported.rs"]
+#[path = "../unsupported/time.rs"]
 mod unsupported_time;
-
 pub use unsupported_time::{SystemTime, UNIX_EPOCH};
 
-use crate::time::Duration;
-
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
 pub struct Instant(Duration);