Skip to content

Commit 94b33d7

Browse files
committed
Update dependency versions.
In particular, this updates to io-lifetimes 3.0.0 and io-extras 0.19.
1 parent e8cbd4b commit 94b33d7

File tree

9 files changed

+21
-19
lines changed

9 files changed

+21
-19
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ rand = "0.8.1"
3030
tempfile = "3.1.0"
3131
camino = "1.0.5"
3232
libc = "0.2.100"
33-
io-lifetimes = "2.0.0"
33+
io-lifetimes = "3.0.1"
3434

3535
[target.'cfg(not(windows))'.dev-dependencies]
3636
rustix = { version = "1.0.0", features = ["fs"] }
@@ -41,7 +41,7 @@ rustix = { version = "1.0.0", features = ["fs"] }
4141
nt_version = "0.1.3"
4242

4343
[target.'cfg(windows)'.dependencies.windows-sys]
44-
version = ">=0.52, <=0.59"
44+
version = ">=0.60, <0.62"
4545
features = [
4646
"Win32_Storage_FileSystem",
4747
"Win32_Foundation",

cap-async-std/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ edition = "2021"
1616
arf-strings = { version = "0.7.0", optional = true }
1717
async-std = { version = "1.13.0", features = ["attributes", "io_safety"] }
1818
cap-primitives = { path = "../cap-primitives", version = "^3.4.5" }
19-
io-lifetimes = { version = "2.0.0", default-features = false, features = ["async-std"] }
20-
io-extras = { version = "0.18.3", features = ["use_async_std"] }
19+
io-lifetimes = { version = "3.0.1", default-features = false, features = ["async-std"] }
20+
io-extras = { version = "0.19.0", features = ["use_async_std"] }
2121
camino = { version = "1.0.5", optional = true }
2222

2323
[target.'cfg(not(windows))'.dependencies]

cap-directories/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ directories-next = "2.0.0"
2020
rustix = { version = "1.0.0" }
2121

2222
[target.'cfg(windows)'.dependencies.windows-sys]
23-
version = ">=0.52, <=0.59"
23+
version = ">=0.60, <0.62"
2424
features = [
2525
"Win32_Foundation",
2626
]

cap-fs-ext/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ arf-strings = { version = "0.7.0", optional = true }
1717
cap-async-std = { path = "../cap-async-std", optional = true, version = "3.4.5" }
1818
cap-std = { path = "../cap-std", optional = true, version = "3.4.5" }
1919
cap-primitives = { path = "../cap-primitives", version = "3.4.5" }
20-
io-lifetimes = { version = "2.0.0", default-features = false }
20+
io-lifetimes = { version = "3.0.1", default-features = false }
2121
async-std = { version = "1.13.0", features = ["io_safety", "attributes"], optional = true }
2222
async-trait = { version = "0.1.42", optional = true }
2323
camino = { version = "1.0.5", optional = true }
@@ -32,7 +32,7 @@ async_std_fs_utf8 = ["cap-async-std/fs_utf8", "camino"]
3232
async_std_arf_strings = ["cap-async-std/arf_strings", "async_std_fs_utf8", "arf-strings"]
3333

3434
[target.'cfg(windows)'.dependencies.windows-sys]
35-
version = ">=0.52, <=0.59"
35+
version = ">=0.60, <0.62"
3636
features = [
3737
"Win32_Storage_FileSystem",
3838
]

cap-primitives/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ arbitrary = { version = "1.0.0", optional = true, features = ["derive"] }
1818
ipnet = "2.5.0"
1919
maybe-owned = "0.3.4"
2020
fs-set-times = "0.20.0"
21-
io-extras = "0.18.3"
22-
io-lifetimes = { version = "2.0.0", default-features = false }
21+
io-extras = "0.19.0"
22+
io-lifetimes = { version = "3.0.1", default-features = false }
2323

2424
[dev-dependencies]
2525
cap-tempfile = { path = "../cap-tempfile" }
@@ -34,7 +34,7 @@ rustix-linux-procfs = "0.1.1"
3434
winx = "0.36.0"
3535

3636
[target.'cfg(windows)'.dependencies.windows-sys]
37-
version = ">=0.52, <=0.59"
37+
version = ">=0.60, <0.62"
3838
features = [
3939
"Win32_Foundation",
4040
"Win32_Security",

cap-primitives/src/windows/fs/create_file_at_w.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ use windows_sys::Win32::Foundation::{
1616
GENERIC_WRITE, HANDLE, INVALID_HANDLE_VALUE, STATUS_OBJECT_NAME_COLLISION, STATUS_PENDING,
1717
STATUS_SUCCESS, SUCCESS, UNICODE_STRING,
1818
};
19+
use windows_sys::Win32::Foundation::{OBJ_CASE_INSENSITIVE, OBJ_INHERIT};
1920
use windows_sys::Win32::Security::{
20-
SECURITY_ATTRIBUTES, SECURITY_DYNAMIC_TRACKING, SECURITY_QUALITY_OF_SERVICE,
21-
SECURITY_STATIC_TRACKING,
21+
SECURITY_ATTRIBUTES, SECURITY_DESCRIPTOR, SECURITY_DYNAMIC_TRACKING,
22+
SECURITY_QUALITY_OF_SERVICE, SECURITY_STATIC_TRACKING,
2223
};
2324
use windows_sys::Win32::Storage::FileSystem::{
2425
CREATE_ALWAYS, CREATE_NEW, DELETE, FILE_ATTRIBUTE_ARCHIVE, FILE_ATTRIBUTE_COMPRESSED,
@@ -36,7 +37,6 @@ use windows_sys::Win32::Storage::FileSystem::{
3637
OPEN_ALWAYS, OPEN_EXISTING, SECURITY_CONTEXT_TRACKING, SECURITY_EFFECTIVE_ONLY,
3738
SECURITY_SQOS_PRESENT, SYNCHRONIZE, TRUNCATE_EXISTING,
3839
};
39-
use windows_sys::Win32::System::Kernel::{OBJ_CASE_INSENSITIVE, OBJ_INHERIT};
4040
use windows_sys::Win32::System::WindowsProgramming::{
4141
FILE_OPENED, FILE_OPEN_NO_RECALL, FILE_OPEN_REMOTE_INSTANCE, FILE_OVERWRITTEN,
4242
};
@@ -159,7 +159,9 @@ pub unsafe fn CreateFileAtW(
159159
objectattributes.ObjectName = &mut unicode_string;
160160
objectattributes.Attributes = attributes;
161161
if !lpsecurityattributes.is_null() {
162-
objectattributes.SecurityDescriptor = (*lpsecurityattributes).lpSecurityDescriptor;
162+
objectattributes.SecurityDescriptor = (*lpsecurityattributes)
163+
.lpSecurityDescriptor
164+
.cast::<SECURITY_DESCRIPTOR>();
163165
}
164166

165167
// If needed, set `objectattributes`' `SecurityQualityOfService` field.
@@ -172,7 +174,7 @@ pub unsafe fn CreateFileAtW(
172174
SECURITY_DYNAMIC_TRACKING
173175
} else {
174176
SECURITY_STATIC_TRACKING
175-
};
177+
} as u8;
176178
qos.EffectiveOnly = ((dwflagsandattributes & SECURITY_EFFECTIVE_ONLY) != 0) as _;
177179

178180
objectattributes.SecurityQualityOfService =

cap-std/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ rustdoc-args = ["--cfg=docsrs"]
1919
[dependencies]
2020
arf-strings = { version = "0.7.0", optional = true }
2121
cap-primitives = { path = "../cap-primitives", version = "^3.4.5" }
22-
io-extras = "0.18.3"
23-
io-lifetimes = { version = "2.0.0", default-features = false }
22+
io-extras = "0.19.0"
23+
io-lifetimes = { version = "3.0.1", default-features = false }
2424
camino = { version = "1.0.5", optional = true }
2525

2626
[target.'cfg(not(windows))'.dependencies]

cap-tempfile/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ rustix = { version = "1.0.0" }
2727
rustix-linux-procfs = "0.1.1"
2828

2929
[target.'cfg(windows)'.dev-dependencies.windows-sys]
30-
version = ">=0.52, <=0.59"
30+
version = ">=0.60, <0.62"
3131
features = [
3232
"Win32_Foundation",
3333
]

fuzz/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cap-primitives = { path = "../cap-primitives", features = ["arbitrary"] }
1515
# Depend on io-lifetimes with default features, as the fuzzing framework
1616
# seems to add a dependency on `io_lifetimes::OwnedFd::drop` even when the
1717
# code itself doesn't have one.
18-
io-lifetimes = "2.0.0"
18+
io-lifetimes = "3.0.1"
1919

2020
[[bin]]
2121
name = "cap-primitives"

0 commit comments

Comments
 (0)