Merging upstream version 1.70.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 2 insertions, 9 deletions

diff --git a/vendor/rustix/src/time/mod.rs b/vendor/rustix/src/time/mod.rs
index ca5b2b2dd..9a0dcb4d7 100644
--- a/vendor/rustix/src/time/mod.rs
+++ b/vendor/rustix/src/time/mod.rs
@@ -7,14 +7,7 @@ mod timerfd;
 
 // TODO: Convert WASI'S clock APIs to use handles rather than ambient clock
 // identifiers, update `wasi-libc`, and then add support in `rustix`.
-#[cfg(not(any(target_os = "redox", target_os = "wasi")))]
-pub use clock::clock_getres;
-#[cfg(not(target_os = "wasi"))]
-pub use clock::{clock_gettime, clock_gettime_dynamic, ClockId, DynamicClockId};
-pub use clock::{Nsecs, Secs, Timespec};
+pub use clock::*;
 #[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
 #[cfg(feature = "time")]
-pub use timerfd::{
-    timerfd_create, timerfd_gettime, timerfd_settime, Itimerspec, TimerfdClockId, TimerfdFlags,
-    TimerfdTimerFlags,
-};
+pub use timerfd::*;