rename bits_time to bits_timespec for consistency

src/header/_aio/mod.rs

@@ -3,7 +3,7 @@
 //! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/aio.h.html>.
 
 use crate::{
-    header::{bits_time::timespec, signal::sigevent},
+    header::{bits_timespec::timespec, signal::sigevent},
     platform::types::{c_int, c_void},
 };
 

src/header/mod.rs

@@ -11,7 +11,7 @@ pub mod bits_locale_t;
 pub mod bits_pthread;
 #[path = "bits_socklen-t/mod.rs"]
 pub mod bits_socklen_t;
-pub mod bits_time;
+pub mod bits_timespec;
 // complex.h implemented in C
 // cpio.h implemented in C
 pub mod crypt;

src/header/netdb/lookup.rs

@@ -12,7 +12,7 @@ use crate::{
 use crate::header::{
     bits_arpainet::htons,
     bits_socklen_t::socklen_t,
-    bits_time::timespec,
+    bits_timespec::timespec,
     errno::*,
     netinet_in::{IPPROTO_UDP, in_addr, sockaddr_in},
     sys_socket::{

src/header/poll/cbindgen.toml

@@ -1,7 +1,7 @@
 sys_includes = ["signal.h"]
 include_guard = "_RELIBC_POLL_H"
 after_includes = """
-#include <bits/time.h> // for timespec
+#include <bits/timespec.h> // for timespec
 """
 language = "C"
 style = "Tag"

src/header/poll/mod.rs

@@ -7,7 +7,7 @@ use core::{mem, ptr, slice};
 use crate::{
     fs::File,
     header::{
-        bits_time::timespec,
+        bits_timespec::timespec,
         errno::EBADF,
         signal::sigset_t,
         sys_epoll::{

src/header/pthread/mod.rs

@@ -7,7 +7,7 @@ use core::{cell::Cell, ptr::NonNull};
 
 use crate::{
     error::Errno,
-    header::{bits_time::timespec, sched::*},
+    header::{bits_timespec::timespec, sched::*},
     platform::{
         Pal, Sys,
         types::{

src/header/sched/cbindgen.toml

@@ -8,7 +8,7 @@
 sys_includes = ["sys/types.h"]
 include_guard = "_RELIBC_SCHED_H"
 after_includes = """
-#include <bits/time.h> // for timespec
+#include <bits/timespec.h> // for timespec
 """
 language = "C"
 style = "Tag"

src/header/sched/mod.rs

@@ -4,7 +4,7 @@
 
 use crate::{
     error::ResultExt,
-    header::bits_time::timespec,
+    header::bits_timespec::timespec,
     platform::{
         Pal, Sys,
         types::{c_int, pid_t},

src/header/semaphore/cbindgen.toml

@@ -1,7 +1,7 @@
 sys_includes = []
 include_guard = "_RELIBC_SEMAPHORE_H"
 after_includes = """
-#include <bits/time.h> // for timespec
+#include <bits/timespec.h> // for timespec
 """
 language = "C"
 style = "Type"

src/header/semaphore/mod.rs

@@ -4,7 +4,7 @@
 
 use crate::{
     header::{
-        bits_time::timespec,
+        bits_timespec::timespec,
         time::{CLOCK_MONOTONIC, CLOCK_REALTIME},
     },
     platform::types::{c_char, c_int, c_long, c_uint, clockid_t},

src/header/signal/cbindgen.toml

@@ -1,7 +1,7 @@
 sys_includes = ["bits/signal.h", "stdint.h", "sys/types.h", "bits/pthread.h", "features.h"]
 include_guard = "_RELIBC_SIGNAL_H"
 after_includes = """
-#include <bits/time.h> // for timespec
+#include <bits/timespec.h> // for timespec
 #include <bits/signal.h>
 """
 language = "C"

src/header/signal/mod.rs

@@ -8,7 +8,7 @@ use cbitset::BitSet;
 
 use crate::{
     error::{Errno, ResultExt},
-    header::{bits_time::timespec, errno, setjmp},
+    header::{bits_timespec::timespec, errno, setjmp},
     platform::{
         self, ERRNO, Pal, PalSignal, Sys,
         types::{

src/header/sys_stat/cbindgen.toml

@@ -7,7 +7,7 @@
 sys_includes = ["sys/types.h"]
 include_guard = "_SYS_STAT_H"
 after_includes = """
-#include <bits/time.h> // for timespec
+#include <bits/timespec.h> // for timespec
 
 #define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
 #define S_ISCHR(mode)  (((mode) & S_IFMT) == S_IFCHR)

src/header/sys_stat/mod.rs

@@ -6,7 +6,7 @@ use crate::{
     c_str::CStr,
     error::ResultExt,
     header::{
-        bits_time::timespec,
+        bits_timespec::timespec,
         fcntl::{O_NOFOLLOW, O_PATH},
     },
     out::Out,

src/header/sys_time/cbindgen.toml

@@ -3,7 +3,7 @@ sys_includes = ["sys/types.h", "sys/select.h"]
 include_guard = "_SYS_TIME_H"
 language = "C"
 after_includes = """
-#include <bits/time.h> // for timespec
+#include <bits/timespec.h> // for timespec
 
 #define timeradd(x,y,res) (void) (\
         (res)->tv_sec = (x)->tv_sec + (y)->tv_sec + (((x)->tv_usec + (y)->tv_usec) / 1000000), \

src/header/sys_time/mod.rs

@@ -9,7 +9,7 @@
 use crate::{
     c_str::CStr,
     error::ResultExt,
-    header::{bits_time::timespec, sys_select::timeval},
+    header::{bits_timespec::timespec, sys_select::timeval},
     out::Out,
     platform::{
         Pal, PalSignal, Sys,

src/header/time/cbindgen.toml

@@ -5,7 +5,7 @@ style = "Tag"
 no_includes = true
 cpp_compat = true
 after_includes = """
-#include <bits/time.h> // for timespec
+#include <bits/timespec.h> // for timespec
 struct sigevent;
 """
 

src/header/time/mod.rs

@@ -6,7 +6,7 @@ use crate::{
     c_str::{CStr, CString},
     error::{Errno, ResultExt},
     header::{
-        bits_time::timespec,
+        bits_timespec::timespec,
         errno::{EFAULT, ENOMEM, EOVERFLOW, ETIMEDOUT},
         signal::sigevent,
         stdlib::getenv,

src/header/unistd/mod.rs

@@ -13,7 +13,7 @@ use crate::{
     c_str::CStr,
     error::{Errno, ResultExt},
     header::{
-        bits_time::timespec,
+        bits_timespec::timespec,
         crypt::{crypt_data, crypt_r},
         errno::{self, ENAMETOOLONG},
         fcntl, limits,

src/header/utime/mod.rs

@@ -8,7 +8,7 @@
 use crate::{
     c_str::CStr,
     error::ResultExt,
-    header::bits_time::timespec,
+    header::bits_timespec::timespec,
     platform::{
         Pal, Sys,
         types::{c_char, c_int, time_t},

src/platform/linux/mod.rs

@@ -4,7 +4,9 @@ use core::arch::asm;
 use super::{Pal, types::*};
 use crate::{
     c_str::CStr,
+    error::{Errno, Result},
     header::{
+        bits_timespec::timespec,
         dirent::dirent,
         errno::{EINVAL, EIO},
         fcntl::{AT_EMPTY_PATH, AT_FDCWD, AT_REMOVEDIR},
@@ -14,6 +16,7 @@ use crate::{
         sys_stat::{S_IFIFO, stat},
         sys_statvfs::statvfs,
         sys_time::timezone,
+        sys_utsname::utsname,
         time::itimerspec,
         unistd::{SEEK_CUR, SEEK_SET},
     },
@@ -22,10 +25,6 @@ use crate::{
 };
 use core::{num::NonZeroU64, ptr};
 // use header::sys_times::tms;
-use crate::{
-    error::{Errno, Result},
-    header::{bits_time::timespec, sys_utsname::utsname},
-};
 
 mod epoll;
 mod ptrace;

src/platform/linux/signal.rs

@@ -13,7 +13,7 @@ use super::{
 use crate::{
     error::{Errno, Result},
     header::{
-        bits_time::timespec,
+        bits_timespec::timespec,
         signal::{SA_RESTORER, SI_QUEUE, sigaction, siginfo_t, sigset_t, sigval, stack_t},
         sys_select::timeval,
         sys_time::{self, itimerval},

src/platform/pal/mod.rs

@@ -5,7 +5,7 @@ use crate::{
     c_str::CStr,
     error::{Errno, Result},
     header::{
-        bits_time::timespec,
+        bits_timespec::timespec,
         signal::sigevent,
         sys_resource::{rlimit, rusage},
         sys_select::timeval,

src/platform/pal/signal.rs

@@ -1,8 +1,11 @@
-use super::super::{Pal, types::*};
+use super::super::{
+    Pal,
+    types::{c_int, c_uint, pid_t},
+};
 use crate::{
     error::{Errno, Result},
     header::{
-        bits_time::timespec,
+        bits_timespec::timespec,
         signal::{sigaction, siginfo_t, sigset_t, sigval, stack_t},
         sys_time::itimerval,
     },

src/platform/redox/event.rs

@@ -1,7 +1,7 @@
 use core::mem::size_of;
 
 use crate::header::{
-    bits_time::timespec,
+    bits_timespec::timespec,
     fcntl::{O_CLOEXEC, O_CREAT, O_RDWR},
     signal::sigset_t,
 };

src/platform/redox/libredox.rs

@@ -12,7 +12,7 @@ use syscall::{
 
 use crate::{
     header::{
-        bits_iovec::iovec, bits_time::timespec, errno::EINVAL, signal::sigaction,
+        bits_iovec::iovec, bits_timespec::timespec, errno::EINVAL, signal::sigaction,
         sys_stat::UTIME_NOW,
     },
     out::Out,

src/platform/redox/mod.rs

@@ -26,7 +26,7 @@ use crate::{
     error::{Errno, Result},
     fs::File,
     header::{
-        bits_time::timespec,
+        bits_timespec::timespec,
         errno::{
             EBADF, EBADFD, EEXIST, EFAULT, EFBIG, EINTR, EINVAL, EIO, ENAMETOOLONG, ENOENT, ENOMEM,
             ENOSYS, EOPNOTSUPP, EPERM,

src/platform/redox/signal.rs

@@ -5,7 +5,7 @@ use super::{
 use crate::{
     error::{Errno, Result},
     header::{
-        bits_time::timespec,
+        bits_timespec::timespec,
         errno::{EINVAL, ENOSYS},
         signal::{
             SIG_BLOCK, SIG_DFL, SIG_IGN, SIG_SETMASK, SIG_UNBLOCK, SIGALRM, SIGEV_SIGNAL,

src/platform/redox/timer.rs

@@ -3,7 +3,7 @@ use syscall::Error;
 use crate::{
     error::{Errno, Result},
     header::{
-        bits_time::timespec,
+        bits_timespec::timespec,
         errno::EIO,
         signal::{SIGEV_SIGNAL, SIGEV_THREAD},
         time::timer_internal_t,

src/sync/cond.rs

@@ -3,7 +3,7 @@
 use crate::{
     error::Errno,
     header::{
-        bits_time::timespec,
+        bits_timespec::timespec,
         errno::{EINVAL, ETIMEDOUT},
         pthread::*,
         time::{CLOCK_MONOTONIC, CLOCK_REALTIME, timespec_realtime_to_monotonic},

src/sync/mod.rs

@@ -20,7 +20,7 @@ pub use self::{
 use crate::{
     error::Errno,
     header::{
-        bits_time::timespec,
+        bits_timespec::timespec,
         errno::{EAGAIN, EINTR, ETIMEDOUT},
     },
     out::Out,

src/sync/pthread_mutex.rs

@@ -5,7 +5,7 @@ use core::{
 
 use crate::{
     error::Errno,
-    header::{bits_time::timespec, errno::*, pthread::*},
+    header::{bits_timespec::timespec, errno::*, pthread::*},
 };
 
 use crate::platform::{Pal, Sys, types::c_int};

src/sync/rwlock.rs

@@ -7,7 +7,7 @@ use core::{
 use crate::{
     error::{Errno, Result},
     header::{
-        bits_time::timespec,
+        bits_timespec::timespec,
         errno::{EINVAL, ETIMEDOUT},
         time::{CLOCK_MONOTONIC, CLOCK_REALTIME, timespec_realtime_to_monotonic},
     },

src/sync/semaphore.rs

@@ -3,7 +3,7 @@
 
 use crate::{
     header::{
-        bits_time::timespec,
+        bits_timespec::timespec,
         time::{CLOCK_MONOTONIC, CLOCK_REALTIME, timespec_realtime_to_monotonic},
     },
     platform::types::{c_uint, clockid_t},