Merging upstream version 1.74.1+dfsg1.

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

2 files changed, 5 insertions, 5 deletions

diff --git a/vendor/io-lifetimes/src/example_ffi.rs b/vendor/io-lifetimes/src/example_ffi.rs
index aac09868e..e77560baa 100644
--- a/vendor/io-lifetimes/src/example_ffi.rs
+++ b/vendor/io-lifetimes/src/example_ffi.rs
@@ -17,7 +17,7 @@ use {
     windows_sys::Win32::Foundation::BOOL,
     windows_sys::Win32::Security::SECURITY_ATTRIBUTES,
     windows_sys::Win32::Storage::FileSystem::{
-        FILE_CREATION_DISPOSITION, FILE_FLAGS_AND_ATTRIBUTES, FILE_SHARE_MODE,
+        FILE_ACCESS_FLAGS, FILE_CREATION_DISPOSITION, FILE_FLAGS_AND_ATTRIBUTES, FILE_SHARE_MODE,
     },
     windows_sys::Win32::System::IO::OVERLAPPED,
 };
@@ -45,7 +45,7 @@ pub use libc::{O_CLOEXEC, O_CREAT, O_RDONLY, O_RDWR, O_TRUNC, O_WRONLY};
 extern "system" {
     pub fn CreateFileW(
         lpfilename: PCWSTR,
-        dwdesiredaccess: u32,
+        dwdesiredaccess: FILE_ACCESS_FLAGS,
         dwsharemode: FILE_SHARE_MODE,
         lpsecurityattributes: *const SECURITY_ATTRIBUTES,
         dwcreationdisposition: FILE_CREATION_DISPOSITION,
diff --git a/vendor/io-lifetimes/src/types.rs b/vendor/io-lifetimes/src/types.rs
index a6f976c1b..8d640dc3b 100644
--- a/vendor/io-lifetimes/src/types.rs
+++ b/vendor/io-lifetimes/src/types.rs
@@ -169,7 +169,7 @@ impl BorrowedFd<'_> {
         // `OwnedFd` instances, so that we don't have to call `fcntl`.
         #[cfg(not(feature = "close"))]
         {
-            unreachable!("try_clone_to_owned called without the \"close\" feature in io-lifetimes");
+            unreachable!("try_clone called without the \"close\" feature in io-lifetimes");
         }
     }
 }
@@ -224,7 +224,7 @@ impl BorrowedHandle<'_> {
         // `OwnedHandle` instances, so that we don't have to call `fcntl`.
         #[cfg(not(feature = "close"))]
         {
-            unreachable!("try_clone_to_owned called without the \"close\" feature in io-lifetimes");
+            unreachable!("try_clone called without the \"close\" feature in io-lifetimes");
         }
     }
 
@@ -361,7 +361,7 @@ impl BorrowedSocket<'_> {
         // `OwnedSocket` instances, so that we don't have to call `fcntl`.
         #[cfg(not(feature = "close"))]
         {
-            unreachable!("try_clone_to_owned called without the \"close\" feature in io-lifetimes");
+            unreachable!("try_clone called without the \"close\" feature in io-lifetimes");
         }
     }
 }