Remove StatExt, which was deprecated. (#1280)

sunfishcode · web-flow · commit 312109694ddd · 2025-01-24T17:21:00.000-08:00
Fix the `Stat` "secs" fields to be signed instead of unsigned, and
remove `StatExt`, which was a workaround for the types incorrectly
being unsigned.
diff --git a/src/backend/libc/fs/types.rs b/src/backend/libc/fs/types.rs
@@ -1035,14 +1035,11 @@ pub struct Stat {
     pub st_size: i64,
     pub st_blksize: u32,
     pub st_blocks: u64,
-    #[deprecated(note = "Use `rustix::fs::StatExt::atime` instead.")]
-    pub st_atime: u64,
+    pub st_atime: i64,
     pub st_atime_nsec: u32,
-    #[deprecated(note = "Use `rustix::fs::StatExt::mtime` instead.")]
-    pub st_mtime: u64,
+    pub st_mtime: i64,
     pub st_mtime_nsec: u32,
-    #[deprecated(note = "Use `rustix::fs::StatExt::ctime` instead.")]
-    pub st_ctime: u64,
+    pub st_ctime: i64,
     pub st_ctime_nsec: u32,
     pub st_ino: u64,
 }
diff --git a/src/backend/linux_raw/fs/types.rs b/src/backend/linux_raw/fs/types.rs
@@ -665,14 +665,11 @@ pub struct Stat {
     pub st_size: i64,
     pub st_blksize: u32,
     pub st_blocks: u64,
-    #[deprecated(note = "Use `rustix::fs::StatExt::atime` instead.")]
-    pub st_atime: u64,
+    pub st_atime: i64,
     pub st_atime_nsec: u32,
-    #[deprecated(note = "Use `rustix::fs::StatExt::mtime` instead.")]
-    pub st_mtime: u64,
+    pub st_mtime: i64,
     pub st_mtime_nsec: u32,
-    #[deprecated(note = "Use `rustix::fs::StatExt::ctime` instead.")]
-    pub st_ctime: u64,
+    pub st_ctime: i64,
     pub st_ctime_nsec: u32,
     pub st_ino: u64,
 }
diff --git a/src/fs/mod.rs b/src/fs/mod.rs
@@ -133,62 +133,3 @@ pub use std::os::unix::fs::{DirEntryExt, FileExt, FileTypeExt, MetadataExt, Open
 #[cfg(feature = "std")]
 #[cfg(all(wasi_ext, target_os = "wasi"))]
 pub use std::os::wasi::fs::{DirEntryExt, FileExt, FileTypeExt, MetadataExt, OpenOptionsExt};
-
-/// Extension trait for accessing timestamp fields of `Stat`.
-///
-/// Rustix's `Stat` type on some platforms has unsigned `st_mtime`,
-/// `st_atime`, and `st_ctime` fields. This is incorrect, as Unix defines
-/// these fields to be signed, with negative values representing dates before
-/// the Unix epoch. Until the next semver bump, these unsigned fields are
-/// deprecated, and this trait provides accessors which return their values
-/// as signed integers.
-#[cfg(unix)]
-pub trait StatExt {
-    /// Return the value of the `st_atime` field, casted to the correct type.
-    fn atime(&self) -> i64;
-    /// Return the value of the `st_mtime` field, casted to the correct type.
-    fn mtime(&self) -> i64;
-    /// Return the value of the `st_ctime` field, casted to the correct type.
-    fn ctime(&self) -> i64;
-}
-
-#[cfg(all(
-    unix,
-    not(any(target_os = "aix", target_os = "hurd", target_os = "nto"))
-))]
-#[allow(deprecated)]
-impl StatExt for Stat {
-    #[inline]
-    fn atime(&self) -> i64 {
-        self.st_atime as i64
-    }
-
-    #[inline]
-    fn mtime(&self) -> i64 {
-        self.st_mtime as i64
-    }
-
-    #[inline]
-    fn ctime(&self) -> i64 {
-        self.st_ctime as i64
-    }
-}
-
-#[cfg(any(target_os = "aix", target_os = "hurd", target_os = "nto"))]
-#[allow(deprecated)]
-impl StatExt for Stat {
-    #[inline]
-    fn atime(&self) -> i64 {
-        self.st_atim.tv_sec as i64
-    }
-
-    #[inline]
-    fn mtime(&self) -> i64 {
-        self.st_mtim.tv_sec as i64
-    }
-
-    #[inline]
-    fn ctime(&self) -> i64 {
-        self.st_ctim.tv_sec as i64
-    }
-}
diff --git a/tests/fs/futimens.rs b/tests/fs/futimens.rs
@@ -1,7 +1,7 @@
 #[cfg(not(any(target_os = "redox", target_os = "wasi")))]
 #[test]
 fn test_futimens() {
-    use rustix::fs::{fstat, futimens, openat, Mode, OFlags, StatExt, Timespec, Timestamps, CWD};
+    use rustix::fs::{fstat, futimens, openat, Mode, OFlags, Timespec, Timestamps, CWD};
 
     let tmp = tempfile::tempdir().unwrap();
     let dir = openat(CWD, tmp.path(), OFlags::RDONLY, Mode::empty()).unwrap();
@@ -28,7 +28,7 @@ fn test_futimens() {
 
     let after = fstat(&file).unwrap();
 
-    assert_eq!(times.last_modification.tv_sec as u64, after.mtime() as u64);
+    assert_eq!(times.last_modification.tv_sec as u64, after.st_mtime as u64);
     #[cfg(not(target_os = "netbsd"))]
     assert_eq!(
         times.last_modification.tv_nsec as u64,
diff --git a/tests/fs/utimensat.rs b/tests/fs/utimensat.rs
@@ -1,9 +1,7 @@
 #[cfg(not(any(target_os = "redox", target_os = "wasi")))]
 #[test]
 fn test_utimensat() {
-    use rustix::fs::{
-        openat, statat, utimensat, AtFlags, Mode, OFlags, StatExt, Timespec, Timestamps, CWD,
-    };
+    use rustix::fs::{openat, statat, utimensat, AtFlags, Mode, OFlags, Timespec, Timestamps, CWD};
 
     let tmp = tempfile::tempdir().unwrap();
     let dir = openat(
@@ -36,7 +34,7 @@ fn test_utimensat() {
 
     let after = statat(&dir, "file", AtFlags::empty()).unwrap();
 
-    assert_eq!(times.last_modification.tv_sec as u64, after.mtime() as u64);
+    assert_eq!(times.last_modification.tv_sec as u64, after.st_mtime as u64);
     #[cfg(not(target_os = "netbsd"))]
     assert_eq!(
         times.last_modification.tv_nsec as u64,
@@ -47,15 +45,15 @@ fn test_utimensat() {
         times.last_modification.tv_nsec as u64,
         after.st_mtimensec as u64
     );
-    assert!(times.last_access.tv_sec as u64 >= after.atime() as u64);
+    assert!(times.last_access.tv_sec as u64 >= after.st_atime as u64);
     #[cfg(not(target_os = "netbsd"))]
     assert!(
-        times.last_access.tv_sec as u64 > after.atime() as u64
+        times.last_access.tv_sec as u64 > after.st_atime as u64
             || times.last_access.tv_nsec as u64 >= after.st_atime_nsec as u64
     );
     #[cfg(target_os = "netbsd")]
     assert!(
-        times.last_access.tv_sec as u64 > after.atime() as u64
+        times.last_access.tv_sec as u64 > after.st_atime as u64
             || times.last_access.tv_nsec as u64 >= after.st_atimensec as u64
     );
 }
diff --git a/tests/fs/y2038.rs b/tests/fs/y2038.rs
@@ -9,7 +9,7 @@
 #[test]
 fn test_y2038_with_utimensat() {
     use rustix::fs::{
-        fstat, openat, statat, utimensat, AtFlags, Mode, OFlags, StatExt, Timespec, Timestamps, CWD,
+        fstat, openat, statat, utimensat, AtFlags, Mode, OFlags, Timespec, Timestamps, CWD,
     };
 
     let tmp = tempfile::tempdir().unwrap();
@@ -46,47 +46,47 @@ fn test_y2038_with_utimensat() {
     // Use `statat` to read back the timestamp.
     let stat = statat(&dir, "file", AtFlags::empty()).unwrap();
 
-    assert_eq!(TryInto::<u64>::try_into(stat.mtime()).unwrap(), m_sec);
+    assert_eq!(TryInto::<u64>::try_into(stat.st_mtime).unwrap(), m_sec);
 
     #[cfg(not(target_os = "netbsd"))]
     assert_eq!(stat.st_mtime_nsec as u32, m_nsec);
     #[cfg(target_os = "netbsd")]
     assert_eq!(stat.st_mtimensec as u32, m_nsec);
 
-    assert!(TryInto::<u64>::try_into(stat.atime()).unwrap() >= a_sec);
+    assert!(TryInto::<u64>::try_into(stat.st_atime).unwrap() >= a_sec);
 
     #[cfg(not(target_os = "netbsd"))]
     assert!(
-        TryInto::<u64>::try_into(stat.atime()).unwrap() > a_sec
+        TryInto::<u64>::try_into(stat.st_atime).unwrap() > a_sec
             || stat.st_atime_nsec as u32 >= a_nsec
     );
     #[cfg(target_os = "netbsd")]
     assert!(
-        TryInto::<u64>::try_into(stat.atime()).unwrap() > a_sec
+        TryInto::<u64>::try_into(stat.st_atime).unwrap() > a_sec
             || stat.st_atimensec as u32 >= a_nsec
     );
 
     // Now test the same thing, but with `fstat`.
     let file = openat(&dir, "file", OFlags::RDONLY, Mode::empty()).unwrap();
     let stat = fstat(&file).unwrap();
 
-    assert_eq!(TryInto::<u64>::try_into(stat.mtime()).unwrap(), m_sec);
+    assert_eq!(TryInto::<u64>::try_into(stat.st_mtime).unwrap(), m_sec);
 
     #[cfg(not(target_os = "netbsd"))]
     assert_eq!(stat.st_mtime_nsec as u32, m_nsec);
     #[cfg(target_os = "netbsd")]
     assert_eq!(stat.st_mtimensec as u32, m_nsec);
 
-    assert!(TryInto::<u64>::try_into(stat.atime()).unwrap() >= a_sec);
+    assert!(TryInto::<u64>::try_into(stat.st_atime).unwrap() >= a_sec);
 
     #[cfg(not(target_os = "netbsd"))]
     assert!(
-        TryInto::<u64>::try_into(stat.atime()).unwrap() > a_sec
+        TryInto::<u64>::try_into(stat.st_atime).unwrap() > a_sec
             || stat.st_atime_nsec as u32 >= a_nsec
     );
     #[cfg(target_os = "netbsd")]
     assert!(
-        TryInto::<u64>::try_into(stat.atime()).unwrap() > a_sec
+        TryInto::<u64>::try_into(stat.st_atime).unwrap() > a_sec
             || stat.st_atimensec as u32 >= a_nsec
     );
 }
@@ -102,7 +102,7 @@ fn test_y2038_with_utimensat() {
 #[test]
 fn test_y2038_with_futimens() {
     use rustix::fs::{
-        fstat, futimens, openat, statat, AtFlags, Mode, OFlags, StatExt, Timespec, Timestamps, CWD,
+        fstat, futimens, openat, statat, AtFlags, Mode, OFlags, Timespec, Timestamps, CWD,
     };
 
     let tmp = tempfile::tempdir().unwrap();
@@ -139,47 +139,47 @@ fn test_y2038_with_futimens() {
     // Use `statat` to read back the timestamp.
     let stat = statat(&dir, "file", AtFlags::empty()).unwrap();
 
-    assert_eq!(TryInto::<u64>::try_into(stat.mtime()).unwrap(), m_sec);
+    assert_eq!(TryInto::<u64>::try_into(stat.st_mtime).unwrap(), m_sec);
 
     #[cfg(not(target_os = "netbsd"))]
     assert_eq!(stat.st_mtime_nsec as u32, m_nsec);
     #[cfg(target_os = "netbsd")]
     assert_eq!(stat.st_mtimensec as u32, m_nsec);
 
-    assert!(TryInto::<u64>::try_into(stat.atime()).unwrap() >= a_sec);
+    assert!(TryInto::<u64>::try_into(stat.st_atime).unwrap() >= a_sec);
 
     #[cfg(not(target_os = "netbsd"))]
     assert!(
-        TryInto::<u64>::try_into(stat.atime()).unwrap() > a_sec
+        TryInto::<u64>::try_into(stat.st_atime).unwrap() > a_sec
             || stat.st_atime_nsec as u32 >= a_nsec
     );
     #[cfg(target_os = "netbsd")]
     assert!(
-        TryInto::<u64>::try_into(stat.atime()).unwrap() > a_sec
+        TryInto::<u64>::try_into(stat.st_atime).unwrap() > a_sec
             || stat.st_atimensec as u32 >= a_nsec
     );
 
     // Now test the same thing, but with `fstat`.
     let file = openat(&dir, "file", OFlags::RDONLY, Mode::empty()).unwrap();
     let stat = fstat(&file).unwrap();
 
-    assert_eq!(TryInto::<u64>::try_into(stat.mtime()).unwrap(), m_sec);
+    assert_eq!(TryInto::<u64>::try_into(stat.st_mtime).unwrap(), m_sec);
 
     #[cfg(not(target_os = "netbsd"))]
     assert_eq!(stat.st_mtime_nsec as u32, m_nsec);
     #[cfg(target_os = "netbsd")]
     assert_eq!(stat.st_mtimensec as u32, m_nsec);
 
-    assert!(TryInto::<u64>::try_into(stat.atime()).unwrap() >= a_sec);
+    assert!(TryInto::<u64>::try_into(stat.st_atime).unwrap() >= a_sec);
 
     #[cfg(not(target_os = "netbsd"))]
     assert!(
-        TryInto::<u64>::try_into(stat.atime()).unwrap() > a_sec
+        TryInto::<u64>::try_into(stat.st_atime).unwrap() > a_sec
             || stat.st_atime_nsec as u32 >= a_nsec
     );
     #[cfg(target_os = "netbsd")]
     assert!(
-        TryInto::<u64>::try_into(stat.atime()).unwrap() > a_sec
+        TryInto::<u64>::try_into(stat.st_atime).unwrap() > a_sec
             || stat.st_atimensec as u32 >= a_nsec
     );
 }
@@ -193,7 +193,7 @@ fn test_y2038_with_futimens() {
 #[cfg(not(all(target_os = "emscripten", target_pointer_width = "32")))]
 #[test]
 fn test_y2038_with_futimens_and_stat() {
-    use rustix::fs::{fstat, futimens, open, stat, Mode, OFlags, StatExt, Timespec, Timestamps};
+    use rustix::fs::{fstat, futimens, open, stat, Mode, OFlags, Timespec, Timestamps};
 
     let tmp = tempfile::tempdir().unwrap();
 
@@ -233,47 +233,47 @@ fn test_y2038_with_futimens_and_stat() {
     // Use `statat` to read back the timestamp.
     let stat = stat(tmp.path().join("file")).unwrap();
 
-    assert_eq!(TryInto::<u64>::try_into(stat.mtime()).unwrap(), m_sec);
+    assert_eq!(TryInto::<u64>::try_into(stat.st_mtime).unwrap(), m_sec);
 
     #[cfg(not(target_os = "netbsd"))]
     assert_eq!(stat.st_mtime_nsec as u32, m_nsec);
     #[cfg(target_os = "netbsd")]
     assert_eq!(stat.st_mtimensec as u32, m_nsec);
 
-    assert!(TryInto::<u64>::try_into(stat.atime()).unwrap() >= a_sec);
+    assert!(TryInto::<u64>::try_into(stat.st_atime).unwrap() >= a_sec);
 
     #[cfg(not(target_os = "netbsd"))]
     assert!(
-        TryInto::<u64>::try_into(stat.atime()).unwrap() > a_sec
+        TryInto::<u64>::try_into(stat.st_atime).unwrap() > a_sec
             || stat.st_atime_nsec as u32 >= a_nsec
     );
     #[cfg(target_os = "netbsd")]
     assert!(
-        TryInto::<u64>::try_into(stat.atime()).unwrap() > a_sec
+        TryInto::<u64>::try_into(stat.st_atime).unwrap() > a_sec
             || stat.st_atimensec as u32 >= a_nsec
     );
 
     // Now test the same thing, but with `fstat`.
     let file = open(tmp.path().join("file"), OFlags::RDONLY, Mode::empty()).unwrap();
     let stat = fstat(&file).unwrap();
 
-    assert_eq!(TryInto::<u64>::try_into(stat.mtime()).unwrap(), m_sec);
+    assert_eq!(TryInto::<u64>::try_into(stat.st_mtime).unwrap(), m_sec);
 
     #[cfg(not(target_os = "netbsd"))]
     assert_eq!(stat.st_mtime_nsec as u32, m_nsec);
     #[cfg(target_os = "netbsd")]
     assert_eq!(stat.st_mtimensec as u32, m_nsec);
 
-    assert!(TryInto::<u64>::try_into(stat.atime()).unwrap() >= a_sec);
+    assert!(TryInto::<u64>::try_into(stat.st_atime).unwrap() >= a_sec);
 
     #[cfg(not(target_os = "netbsd"))]
     assert!(
-        TryInto::<u64>::try_into(stat.atime()).unwrap() > a_sec
+        TryInto::<u64>::try_into(stat.st_atime).unwrap() > a_sec
             || stat.st_atime_nsec as u32 >= a_nsec
     );
     #[cfg(target_os = "netbsd")]
     assert!(
-        TryInto::<u64>::try_into(stat.atime()).unwrap() > a_sec
+        TryInto::<u64>::try_into(stat.st_atime).unwrap() > a_sec
             || stat.st_atimensec as u32 >= a_nsec
     );
 }
