Merging upstream version 1.74.1+dfsg1.

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

3 files changed, 36 insertions, 7 deletions

diff --git a/vendor/rustix/src/event/kqueue.rs b/vendor/rustix/src/event/kqueue.rs
index ff0ffddc0..05ee4d71b 100644
--- a/vendor/rustix/src/event/kqueue.rs
+++ b/vendor/rustix/src/event/kqueue.rs
@@ -99,6 +99,12 @@ impl Event {
         self.inner.udata as _
     }
 
+    /// Get the raw data for this event.
+    pub fn data(&self) -> i64 {
+        // On some bsds, data is an isize and not an i64
+        self.inner.data as _
+    }
+
     /// Get the filter of this event.
     pub fn filter(&self) -> EventFilter {
         match self.inner.filter as _ {
@@ -256,6 +262,9 @@ bitflags::bitflags! {
 
         /// TODO
         const ERROR = c::EV_ERROR as _;
+
+        /// <https://docs.rs/bitflags/latest/bitflags/#externally-defined-flags>
+        const _ = !0;
     }
 }
 
@@ -284,6 +293,9 @@ bitflags::bitflags! {
 
         /// The link count of the file has changed.
         const LINK = c::NOTE_LINK;
+
+        /// <https://docs.rs/bitflags/latest/bitflags/#externally-defined-flags>
+        const _ = !0;
     }
 }
 
@@ -301,11 +313,14 @@ bitflags::bitflags! {
         /// The process executed a new process.
         const EXEC = c::NOTE_EXEC;
 
-        /// Follow the process through `fork()` calls (write only).
+        /// Follow the process through `fork` calls (write only).
         const TRACK = c::NOTE_TRACK;
 
         /// An error has occurred with following the process.
         const TRACKERR = c::NOTE_TRACKERR;
+
+        /// <https://docs.rs/bitflags/latest/bitflags/#externally-defined-flags>
+        const _ = !0;
     }
 }
 
@@ -335,6 +350,9 @@ bitflags::bitflags! {
 
         /// Trigger the event.
         const TRIGGER = c::NOTE_TRIGGER;
+
+        /// <https://docs.rs/bitflags/latest/bitflags/#externally-defined-flags>
+        const _ = !0;
     }
 }
 
diff --git a/vendor/rustix/src/event/mod.rs b/vendor/rustix/src/event/mod.rs
index 192afdcaa..03abc9f12 100644
--- a/vendor/rustix/src/event/mod.rs
+++ b/vendor/rustix/src/event/mod.rs
@@ -1,15 +1,25 @@
 //! Event operations.
 
-#[cfg(any(linux_kernel, target_os = "freebsd", target_os = "illumos"))]
+#[cfg(any(
+    linux_kernel,
+    target_os = "freebsd",
+    target_os = "illumos",
+    target_os = "espidf"
+))]
 mod eventfd;
-#[cfg(bsd)]
+#[cfg(all(feature = "alloc", bsd))]
 pub mod kqueue;
 mod poll;
 #[cfg(solarish)]
 pub mod port;
 
-#[cfg(linux_kernel)]
+#[cfg(all(feature = "alloc", linux_kernel))]
 pub use crate::backend::event::epoll;
-#[cfg(any(linux_kernel, target_os = "freebsd", target_os = "illumos"))]
+#[cfg(any(
+    linux_kernel,
+    target_os = "freebsd",
+    target_os = "illumos",
+    target_os = "espidf"
+))]
 pub use eventfd::{eventfd, EventfdFlags};
 pub use poll::{poll, PollFd, PollFlags};
diff --git a/vendor/rustix/src/event/port.rs b/vendor/rustix/src/event/port.rs
index b04f7c496..39fe5ac16 100644
--- a/vendor/rustix/src/event/port.rs
+++ b/vendor/rustix/src/event/port.rs
@@ -72,8 +72,8 @@ pub unsafe fn port_associate_fd(
     )
 }
 
-/// `port_dissociate(_, PORT_SOURCE_FD, _)`—Dissociates a file descriptor from
-/// a port.
+/// `port_dissociate(_, PORT_SOURCE_FD, _)`—Dissociates a file descriptor
+/// from a port.
 ///
 /// # Safety
 ///
@@ -116,6 +116,7 @@ pub fn port_get(port: impl AsFd, timeout: Option<Duration>) -> io::Result<Event>
 ///
 /// [OpenSolaris]: https://www.unix.com/man-page/opensolaris/3C/port_getn/
 /// [illumos]: https://illumos.org/man/3C/port_getn
+#[cfg(feature = "alloc")]
 pub fn port_getn(
     port: impl AsFd,
     events: &mut Vec<Event>,