Skip to content

Commit 5e4191d

Browse files
authored
cargo: Bump windows crate range to 0.53-0.59 (#258)
* cargo: Bump `windows` crate range to `0.53-0.59` Note that `windows 0.59` bumps the MSRV to `1.74`, but we still support this crate dependency all the way back to `0.53`. * CI: Use minimal dependency versions when running MSRV check For the time being we have to instruct `cargo` to use some lower version of our dependencies to ensure our MSRV doesn't need to be bumped - that is one of the resons why we have a supported version range on our dependencies. In the future when Rust 1.84 becomes our MSRV, it will be able to resolve these automatically (assumming crates set their `rust-version` correctly if at all!): https://blog.rust-lang.org/2025/01/09/Rust-1.84.0.html#cargo-considers-rust-versions-for-dependency-version-selection * Address new clippy lints
1 parent e6dbe11 commit 5e4191d

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

.cargo/config.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ rustflags = [
4444
"-Wclippy::match_wild_err_arm",
4545
"-Wclippy::match_wildcard_for_single_variants",
4646
"-Wclippy::mem_forget",
47-
"-Wclippy::mismatched_target_os",
4847
"-Wclippy::missing_enforced_import_renames",
4948
"-Wclippy::mut_mut",
5049
"-Wclippy::mutex_integer",

.github/workflows/ci.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818
steps:
1919
- uses: actions/checkout@v4
20+
- uses: dtolnay/rust-toolchain@nightly
21+
- name: Generate lockfile with minimal dependency versions
22+
run: cargo +nightly generate-lockfile -Zminimal-versions
2023
- uses: dtolnay/[email protected]
2124
# Note that examples are extempt from the MSRV check, so that they can use newer Rust features
2225
- run: cargo check --workspace --features ${{ matrix.features }} --no-default-features
@@ -65,13 +68,6 @@ jobs:
6568
- name: Cargo clippy
6669
run: cargo clippy --workspace --all-targets --features ${{ matrix.features }} --no-default-features -- -D warnings
6770

68-
- name: Install nightly Rust
69-
uses: dtolnay/rust-toolchain@nightly
70-
- name: Generate lockfile with minimal dependency versions
71-
run: cargo +nightly generate-lockfile -Zminimal-versions
72-
- name: Cargo clippy with minimal-versions
73-
run: cargo +stable clippy --workspace --features ${{ matrix.features }} --no-default-features -- -D warnings
74-
7571
doc:
7672
name: Build documentation
7773
strategy:

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ objc2-metal = { version = "0.2.1", default-features = false, features = [
5151
winapi = { version = "0.3.9", features = ["d3d12", "winerror", "impl-default", "impl-debug"], optional = true }
5252

5353
[target.'cfg(windows)'.dependencies.windows]
54-
version = ">=0.53,<=0.58"
54+
version = ">=0.53,<=0.59"
5555
features = [
5656
"Win32_Graphics_Direct3D12",
5757
"Win32_Graphics_Dxgi_Common",
@@ -68,7 +68,7 @@ winapi = { version = "0.3.9", features = ["d3d12", "d3d12sdklayers", "dxgi1_6",
6868

6969
[target.'cfg(windows)'.dev-dependencies.windows]
7070
# API-breaks since Windows 0.58 only affect our examples
71-
version = "0.58"
71+
version = ">=0.58,<=0.59"
7272
features = [
7373
"Win32_Graphics_Direct3D",
7474
"Win32_Graphics_Direct3D12",

src/vulkan/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ pub struct MappedAllocationSlab<'a> {
287287
}
288288

289289
// SAFETY: See the safety comment of Allocation::as_mapped_slab above.
290-
unsafe impl<'a> presser::Slab for MappedAllocationSlab<'a> {
290+
unsafe impl presser::Slab for MappedAllocationSlab<'_> {
291291
fn base_ptr(&self) -> *const u8 {
292292
self.mapped_ptr
293293
}

0 commit comments

Comments
 (0)