Merging upstream version 1.74.1+dfsg1.

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

4 files changed, 8 insertions, 8 deletions

diff --git a/vendor/io-lifetimes/.cargo-checksum.json b/vendor/io-lifetimes/.cargo-checksum.json
index c5fcc87b6..9fc1b74ff 100644
--- a/vendor/io-lifetimes/.cargo-checksum.json
+++ b/vendor/io-lifetimes/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CODE_OF_CONDUCT.md":"e0bd80144c93b032dadb144d7cf8663c55d697ba2dd60382715c981dfc60e421","COPYRIGHT":"495c30b45120f8af07cfa26eb9cb1ebfe8324560dca2b3b1e76cad1b9b6b489a","Cargo.toml":"6134b9aec8e8e3183613d18b9fd28a7276cb789b63f1d50059896b0ed41a8161","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-Apache-2.0_WITH_LLVM-exception":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","ORG_CODE_OF_CONDUCT.md":"a62b69bf86e605ee1bcbb2f0a12ba79e4cebb6983a7b6491949750aecc4f2178","README.md":"c6fd1e6acd03d78ca69275d3fb7fe27b7148ff62e11e617eec25e3a886caf082","build.rs":"58379e213e1758e25de92a04a1a6b3feb283321c3652e2271fc688879320147c","src/example_ffi.rs":"9a7e509b23b0e44958bfe20ea9e399b22ebd7d0204813f68b4c1ce1e8f3bef84","src/impls_async_std.rs":"62f73e42a2e76a9287f72f1c3db322114d4a08a2d8e2715c04156df60df1f876","src/impls_fs_err.rs":"12333298a291377a8c24835c60dfa3338e413e6435576cede04ce780da84ebe6","src/impls_mio.rs":"32ba71c1912d7dedcb110cb91dd953bab05a039d576c55a7508fcdad1bebbc2b","src/impls_os_pipe.rs":"5075498711f2dfdd6795d3afdb81bd3aca26c033d2f8f7238de59016d3ead0a9","src/impls_socket2.rs":"deacb4dd2c1e19ef483c937b6a18034397d729c3df361de5e748d70f5457f48b","src/impls_std.rs":"d11c66589a19b431062c316eaa77e1648e73aacd4ffabf9f575e5ccd2dec4083","src/impls_tokio.rs":"4f5f3dbdfa9395cd7e5149658cbd3872fa6c3973e1c844b7f6b48ee2e39e9197","src/lib.rs":"ca2d5187b1c25c21c18dc2e81988d6b7fda54d60a431802c2e53caef62d0814d","src/portability.rs":"d01be95b82bd36e09cf196a7c5f596a3d64c947aca34224efff164c87f358bcf","src/raw.rs":"16ff59fcc9ed2e08df56de40e25337bfe929bf77ec69ff4742902f39af8cc968","src/traits.rs":"e4856985681aad7bdd9c3cbb84a20c7233e1daa242220a82ee10514474fa05c7","src/types.rs":"b2204542721026c047a944febe2a245c8101f77f4a4ba7e14bae71761cdb3ea0","src/views.rs":"a13342880bed2af759829ba4a5cf2502ef781612138c447820eb36da9450a843"},"package":"eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"}
\ No newline at end of file
+{"files":{"CODE_OF_CONDUCT.md":"e0bd80144c93b032dadb144d7cf8663c55d697ba2dd60382715c981dfc60e421","COPYRIGHT":"495c30b45120f8af07cfa26eb9cb1ebfe8324560dca2b3b1e76cad1b9b6b489a","Cargo.toml":"1f84b8c1b7b42968671bcdbba31196831a95035cc95c3e5c73a65d3dc89fcc96","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-Apache-2.0_WITH_LLVM-exception":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","ORG_CODE_OF_CONDUCT.md":"a62b69bf86e605ee1bcbb2f0a12ba79e4cebb6983a7b6491949750aecc4f2178","README.md":"c6fd1e6acd03d78ca69275d3fb7fe27b7148ff62e11e617eec25e3a886caf082","build.rs":"58379e213e1758e25de92a04a1a6b3feb283321c3652e2271fc688879320147c","src/example_ffi.rs":"c9db4344e2d4b01a7310b05174c88e1933e367037c862fc192a4ee5d9166ae7e","src/impls_async_std.rs":"62f73e42a2e76a9287f72f1c3db322114d4a08a2d8e2715c04156df60df1f876","src/impls_fs_err.rs":"12333298a291377a8c24835c60dfa3338e413e6435576cede04ce780da84ebe6","src/impls_mio.rs":"32ba71c1912d7dedcb110cb91dd953bab05a039d576c55a7508fcdad1bebbc2b","src/impls_os_pipe.rs":"5075498711f2dfdd6795d3afdb81bd3aca26c033d2f8f7238de59016d3ead0a9","src/impls_socket2.rs":"deacb4dd2c1e19ef483c937b6a18034397d729c3df361de5e748d70f5457f48b","src/impls_std.rs":"d11c66589a19b431062c316eaa77e1648e73aacd4ffabf9f575e5ccd2dec4083","src/impls_tokio.rs":"4f5f3dbdfa9395cd7e5149658cbd3872fa6c3973e1c844b7f6b48ee2e39e9197","src/lib.rs":"ca2d5187b1c25c21c18dc2e81988d6b7fda54d60a431802c2e53caef62d0814d","src/portability.rs":"d01be95b82bd36e09cf196a7c5f596a3d64c947aca34224efff164c87f358bcf","src/raw.rs":"16ff59fcc9ed2e08df56de40e25337bfe929bf77ec69ff4742902f39af8cc968","src/traits.rs":"e4856985681aad7bdd9c3cbb84a20c7233e1daa242220a82ee10514474fa05c7","src/types.rs":"88eb942b05bcaa7858e8949763031ba69fca5fad01aee4ea43fafa4448ce0654","src/views.rs":"a13342880bed2af759829ba4a5cf2502ef781612138c447820eb36da9450a843"},"package":"09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb"}
\ No newline at end of file
diff --git a/vendor/io-lifetimes/Cargo.toml b/vendor/io-lifetimes/Cargo.toml
index ef92ff053..6d12b401b 100644
--- a/vendor/io-lifetimes/Cargo.toml
+++ b/vendor/io-lifetimes/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2018"
 name = "io-lifetimes"
-version = "1.0.11"
+version = "1.0.9"
 authors = ["Dan Gohman <dev@sunfishcode.online>"]
 include = [
     "src",
@@ -87,7 +87,7 @@ version = "0.3"
 optional = true
 
 [target."cfg(windows)".dependencies.windows-sys]
-version = "0.48.0"
+version = "0.45.0"
 features = [
     "Win32_Foundation",
     "Win32_Storage_FileSystem",
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");
         }
     }
 }