Merging upstream version 1.72.1+dfsg1.

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

2 files changed, 4 insertions, 6 deletions

diff --git a/vendor/rustix/src/time/clock.rs b/vendor/rustix/src/time/clock.rs
index 2aa38b213..db585d1cc 100644
--- a/vendor/rustix/src/time/clock.rs
+++ b/vendor/rustix/src/time/clock.rs
@@ -1,10 +1,10 @@
 use crate::{backend, io};
 
-pub use backend::time::types::{Nsecs, Secs, Timespec};
+pub use crate::timespec::{Nsecs, Secs, Timespec};
 
 /// `clockid_t`
 #[cfg(not(target_os = "wasi"))]
-pub use backend::time::types::{ClockId, DynamicClockId};
+pub use crate::clockid::{ClockId, DynamicClockId};
 
 /// `clock_getres(id)`—Returns the resolution of a clock.
 ///
diff --git a/vendor/rustix/src/time/mod.rs b/vendor/rustix/src/time/mod.rs
index 9a0dcb4d7..c633e767f 100644
--- a/vendor/rustix/src/time/mod.rs
+++ b/vendor/rustix/src/time/mod.rs
@@ -1,13 +1,11 @@
 //! Time-related operations.
 
 mod clock;
-#[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
-#[cfg(feature = "time")]
+#[cfg(any(linux_kernel, target_os = "fuchsia"))]
 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`.
 pub use clock::*;
-#[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
-#[cfg(feature = "time")]
+#[cfg(any(linux_kernel, target_os = "fuchsia"))]
 pub use timerfd::*;