Skip to content

Commit 83f484a

Browse files
authored
Update dependency versions. (#400)
* Update dependency versions. In particular, this updates to io-lifetimes 3.0.0 and io-extras 0.19. * Fix Windows. * Update the MSRV to 1.70. * Fix yaml syntax.
1 parent 4a247b9 commit 83f484a

File tree

11 files changed

+24
-24
lines changed

11 files changed

+24
-24
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ jobs:
362362
include:
363363
- build: msrv
364364
os: ubuntu-latest
365-
rust: 1.63
365+
rust: "1.70"
366366

367367
steps:
368368
- uses: actions/checkout@v4
@@ -372,7 +372,7 @@ jobs:
372372
with:
373373
toolchain: ${{ matrix.rust }}
374374

375-
- name: Use specific dependency versions for Rust 1.63 compatibility.
375+
- name: Use specific dependency versions for Rust 1.70 compatibility.
376376
run: |
377377
cargo update --package=once_cell --precise=1.20.3
378378

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ edition = "2021"
1414
publish = false
1515
exclude = ["/.*"]
1616
# This is also checked in CI.
17-
rust-version = "1.63"
17+
rust-version = "1.70"
1818

1919
[dev-dependencies]
2020
anyhow = "1.0.37"
@@ -28,7 +28,7 @@ rand = "0.9.2"
2828
tempfile = "3.1.0"
2929
camino = "1.0.5"
3030
libc = "0.2.100"
31-
io-lifetimes = "2.0.0"
31+
io-lifetimes = "3.0.1"
3232

3333
[target.'cfg(not(windows))'.dev-dependencies]
3434
rustix = { version = "1.0.0", features = ["fs"] }
@@ -39,7 +39,7 @@ rustix = { version = "1.0.0", features = ["fs"] }
3939
nt_version = "0.1.3"
4040

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ the process filesystem namespace.
246246

247247
## Minimum Supported Rust Version (MSRV)
248248

249-
This crate currently works on Rust 1.63, when default features are enabled.
249+
This crate currently works on Rust 1.70, when default features are enabled.
250250
Some of the optional features have stricter requirements.
251251

252252
[`arf-strings`]: https://github.com/bytecodealliance/arf-strings/

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
@@ -16,7 +16,7 @@ edition = "2021"
1616
arf-strings = { version = "0.7.0", optional = true }
1717
cap-std = { path = "../cap-std", optional = true, version = "3.4.5" }
1818
cap-primitives = { path = "../cap-primitives", version = "3.4.5" }
19-
io-lifetimes = { version = "2.0.0", default-features = false }
19+
io-lifetimes = { version = "3.0.1", default-features = false }
2020
camino = { version = "1.0.5", optional = true }
2121

2222
[features]
@@ -26,7 +26,7 @@ arf_strings = ["cap-std/arf_strings", "fs_utf8", "arf-strings"]
2626
std = ["cap-std"]
2727

2828
[target.'cfg(windows)'.dependencies.windows-sys]
29-
version = ">=0.52, <=0.59"
29+
version = ">=0.60, <0.62"
3030
features = [
3131
"Win32_Storage_FileSystem",
3232
]

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)