Merging upstream version 1.74.1+dfsg1.

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

2 files changed, 12 insertions, 6 deletions

diff --git a/vendor/rustix/src/backend/libc/pipe/syscalls.rs b/vendor/rustix/src/backend/libc/pipe/syscalls.rs
index 24262cc9a..cff932d55 100644
--- a/vendor/rustix/src/backend/libc/pipe/syscalls.rs
+++ b/vendor/rustix/src/backend/libc/pipe/syscalls.rs
@@ -55,9 +55,9 @@ pub(crate) fn pipe_with(flags: PipeFlags) -> io::Result<(OwnedFd, OwnedFd)> {
 #[cfg(linux_kernel)]
 #[inline]
 pub fn splice(
-    fd_in: BorrowedFd,
+    fd_in: BorrowedFd<'_>,
     off_in: Option<&mut u64>,
-    fd_out: BorrowedFd,
+    fd_out: BorrowedFd<'_>,
     off_out: Option<&mut u64>,
     len: usize,
     flags: SpliceFlags,
@@ -80,8 +80,8 @@ pub fn splice(
 #[cfg(linux_kernel)]
 #[inline]
 pub unsafe fn vmsplice(
-    fd: BorrowedFd,
-    bufs: &[IoSliceRaw],
+    fd: BorrowedFd<'_>,
+    bufs: &[IoSliceRaw<'_>],
     flags: SpliceFlags,
 ) -> io::Result<usize> {
     ret_usize(c::vmsplice(
@@ -95,8 +95,8 @@ pub unsafe fn vmsplice(
 #[cfg(linux_kernel)]
 #[inline]
 pub fn tee(
-    fd_in: BorrowedFd,
-    fd_out: BorrowedFd,
+    fd_in: BorrowedFd<'_>,
+    fd_out: BorrowedFd<'_>,
     len: usize,
     flags: SpliceFlags,
 ) -> io::Result<usize> {
diff --git a/vendor/rustix/src/backend/libc/pipe/types.rs b/vendor/rustix/src/backend/libc/pipe/types.rs
index 3fa0464e0..7f5634b17 100644
--- a/vendor/rustix/src/backend/libc/pipe/types.rs
+++ b/vendor/rustix/src/backend/libc/pipe/types.rs
@@ -25,6 +25,9 @@ bitflags! {
         const DIRECT = bitcast!(c::O_DIRECT);
         /// `O_NONBLOCK`
         const NONBLOCK = bitcast!(c::O_NONBLOCK);
+
+        /// <https://docs.rs/bitflags/latest/bitflags/#externally-defined-flags>
+        const _ = !0;
     }
 }
 
@@ -43,6 +46,9 @@ bitflags! {
         const MORE = c::SPLICE_F_MORE;
         /// `SPLICE_F_GIFT`
         const GIFT = c::SPLICE_F_GIFT;
+
+        /// <https://docs.rs/bitflags/latest/bitflags/#externally-defined-flags>
+        const _ = !0;
     }
 }