re-export relevant items from unsupported in vexos modules

Author: Tropix126

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

@@ -8,6 +8,15 @@ use crate::sys::common::small_c_string::run_path_with_cstr;
 use crate::sys::time::SystemTime;
 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,
+};
+
 #[derive(Debug)]
 struct FileDesc(*mut vex_sdk::FIL);
 
@@ -21,8 +30,6 @@ pub enum FileAttr {
     File { size: u64 },
 }
 
-pub struct ReadDir(!);
-
 pub struct DirEntry {
     path: PathBuf,
 }
@@ -37,20 +44,11 @@ pub struct OpenOptions {
     create_new: bool,
 }
 
-#[derive(Copy, Clone, Debug, Default)]
-pub struct FileTimes {}
-
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub struct FilePermissions {}
-
 #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
 pub struct FileType {
     is_dir: bool,
 }
 
-#[derive(Debug)]
-pub struct DirBuilder {}
-
 impl FileAttr {
     /// Creates a FileAttr by getting data from an opened file.
     fn from_fd(fd: *mut vex_sdk::FIL) -> io::Result<Self> {
@@ -110,21 +108,6 @@ impl FileAttr {
     }
 }
 
-impl FilePermissions {
-    pub fn readonly(&self) -> bool {
-        false
-    }
-
-    pub fn set_readonly(&mut self, _readonly: bool) {
-        panic!("Perimissions do not exist")
-    }
-}
-
-impl FileTimes {
-    pub fn set_accessed(&mut self, _t: SystemTime) {}
-    pub fn set_modified(&mut self, _t: SystemTime) {}
-}
-
 impl FileType {
     pub fn is_dir(&self) -> bool {
         self.is_dir
@@ -140,38 +123,6 @@ 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 {
@@ -474,16 +425,6 @@ impl File {
     }
 }
 
-impl DirBuilder {
-    pub fn new() -> DirBuilder {
-        DirBuilder {}
-    }
-
-    pub fn mkdir(&self, _p: &Path) -> io::Result<()> {
-        unsupported()
-    }
-}
-
 impl fmt::Debug for File {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("File").field("fd", &self.fd.0).finish()
@@ -495,53 +436,10 @@ 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 unlink(_p: &Path) -> io::Result<()> {
-    unsupported()
-}
-
-pub fn rename(_old: &Path, _new: &Path) -> io::Result<()> {
-    unsupported()
-}
-
-pub fn set_perm(_p: &Path, _perm: FilePermissions) -> io::Result<()> {
-    unsupported()
-}
-
-pub fn rmdir(_p: &Path) -> io::Result<()> {
-    unsupported()
-}
-
-pub fn remove_dir_all(_path: &Path) -> 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))
 }
 
-pub fn readlink(_p: &Path) -> io::Result<PathBuf> {
-    unsupported()
-}
-
-pub fn symlink(_original: &Path, _link: &Path) -> io::Result<()> {
-    unsupported()
-}
-
-pub fn link(_src: &Path, _dst: &Path) -> io::Result<()> {
-    unsupported()
-}
-
 pub fn stat(p: &Path) -> io::Result<FileAttr> {
     FileAttr::from_path(p)
 }
@@ -551,10 +449,6 @@ pub fn lstat(p: &Path) -> io::Result<FileAttr> {
     stat(p)
 }
 
-pub fn canonicalize(_p: &Path) -> io::Result<PathBuf> {
-    unsupported()
-}
-
 pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
     use crate::fs::File;
 

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

@@ -1,11 +1,15 @@
+#[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};
 
-pub const DEFAULT_MIN_STACK_SIZE: usize = 64 * 1024;
-
 pub struct Thread(!);
 
 impl Thread {
@@ -50,11 +54,3 @@ impl Thread {
         self.0
     }
 }
-
-pub(crate) fn current_os_id() -> Option<u64> {
-    None
-}
-
-pub fn available_parallelism() -> io::Result<NonZero<usize>> {
-    unsupported()
-}

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

@@ -1,13 +1,14 @@
+#[expect(dead_code)]
+#[path = "unsupported.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);
 
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
-pub struct SystemTime(Duration);
-
-pub const UNIX_EPOCH: SystemTime = SystemTime(Duration::from_secs(0));
-
 impl Instant {
     pub fn now() -> Instant {
         let micros = unsafe { vex_sdk::vexSystemHighResTimeGet() };
@@ -26,28 +27,3 @@ impl Instant {
         Some(Instant(self.0.checked_sub(*other)?))
     }
 }
-
-impl SystemTime {
-    pub fn now() -> SystemTime {
-        panic!("system time not implemented on this platform")
-    }
-
-    #[rustc_const_unstable(feature = "const_system_time", issue = "144517")]
-    pub const fn sub_time(&self, other: &SystemTime) -> Result<Duration, Duration> {
-        // FIXME: ok_or_else with const closures
-        match self.0.checked_sub(other.0) {
-            Some(duration) => Ok(duration),
-            None => Err(other.0 - self.0),
-        }
-    }
-
-    #[rustc_const_unstable(feature = "const_system_time", issue = "144517")]
-    pub const fn checked_add_duration(&self, other: &Duration) -> Option<SystemTime> {
-        Some(SystemTime(self.0.checked_add(*other)?))
-    }
-
-    #[rustc_const_unstable(feature = "const_system_time", issue = "144517")]
-    pub const fn checked_sub_duration(&self, other: &Duration) -> Option<SystemTime> {
-        Some(SystemTime(self.0.checked_sub(*other)?))
-    }
-}