migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-29 04:40:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bump MSRV to 1.86

Browse Source
This commit is contained in:
Ian Douglas Scott
2026-07-23 08:58:23 -07:00
committed by Kirill Chibisov
parent 0ea5f3c875
commit 0e7ed677f1
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/ci.yml vendored
View File

@@ -55,7 +55,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
toolchain: [stable, nightly, '1.85'] toolchain: [stable, nightly, '1.86']
platform: platform:
# Note: Make sure that we test all the `docs.rs` targets defined in Cargo.toml! # Note: Make sure that we test all the `docs.rs` targets defined in Cargo.toml!
- { name: 'Windows 64bit MSVC', target: x86_64-pc-windows-msvc, os: windows-latest, } - { name: 'Windows 64bit MSVC', target: x86_64-pc-windows-msvc, os: windows-latest, }
@@ -82,13 +82,13 @@ jobs:
- toolchain: nightly - toolchain: nightly
platform: { name: 'Windows 32bit GNU' } platform: { name: 'Windows 32bit GNU' }
# Android is tested on stable-3 # Android is tested on stable-3
- toolchain: '1.85' - toolchain: '1.86'
platform: { name: 'Android' } platform: { name: 'Android' }
# Redox OS doesn't follow MSRV # Redox OS doesn't follow MSRV
- toolchain: '1.85' - toolchain: '1.86'
platform: { name: 'Redox OS' } platform: { name: 'Redox OS' }
include: include:
- toolchain: '1.85' - toolchain: '1.86'
platform: { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package winit --features=android-native-activity', cmd: 'apk -- ' } platform: { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package winit --features=android-native-activity', cmd: 'apk -- ' }
- toolchain: 'nightly' - toolchain: 'nightly'
platform: { name: 'Web', target: wasm32-unknown-unknown, os: ubuntu-latest, test-options: -Zdoctest-xcompile } platform: { name: 'Web', target: wasm32-unknown-unknown, os: ubuntu-latest, test-options: -Zdoctest-xcompile }
@@ -230,19 +230,19 @@ jobs:
- name: Test dpi crate - name: Test dpi crate
if: > if: >
contains(matrix.platform.name, 'Linux 64bit') && contains(matrix.platform.name, 'Linux 64bit') &&
matrix.toolchain != '1.85' matrix.toolchain != '1.86'
run: cargo test -p dpi run: cargo test -p dpi
- name: Check dpi crate (no_std) - name: Check dpi crate (no_std)
if: > if: >
contains(matrix.platform.name, 'Linux 64bit') && contains(matrix.platform.name, 'Linux 64bit') &&
matrix.toolchain != '1.85' matrix.toolchain != '1.86'
run: cargo check -p dpi --no-default-features run: cargo check -p dpi --no-default-features
- name: Build tests - name: Build tests
if: > if: >
!contains(matrix.platform.target, 'redox') && !contains(matrix.platform.target, 'redox') &&
matrix.toolchain != '1.85' matrix.toolchain != '1.86'
run: cargo $CMD test --no-run $OPTIONS run: cargo $CMD test --no-run $OPTIONS
- name: Run tests - name: Run tests
@@ -251,7 +251,7 @@ jobs:
!contains(matrix.platform.target, 'ios') && !contains(matrix.platform.target, 'ios') &&
(!contains(matrix.platform.target, 'wasm32') || matrix.toolchain == 'nightly') && (!contains(matrix.platform.target, 'wasm32') || matrix.toolchain == 'nightly') &&
!contains(matrix.platform.target, 'redox') && !contains(matrix.platform.target, 'redox') &&
matrix.toolchain != '1.85' matrix.toolchain != '1.86'
run: cargo $CMD test $OPTIONS run: cargo $CMD test $OPTIONS
- name: Lint with clippy - name: Lint with clippy
@@ -261,7 +261,7 @@ jobs:
- name: Build tests with serde enabled - name: Build tests with serde enabled
if: > if: >
!contains(matrix.platform.target, 'redox') && !contains(matrix.platform.target, 'redox') &&
matrix.toolchain != '1.85' matrix.toolchain != '1.86'
run: cargo $CMD test --no-run $OPTIONS $TEST_OPTIONS --features serde run: cargo $CMD test --no-run $OPTIONS $TEST_OPTIONS --features serde
- name: Run tests with serde enabled - name: Run tests with serde enabled
@@ -270,7 +270,7 @@ jobs:
!contains(matrix.platform.target, 'ios') && !contains(matrix.platform.target, 'ios') &&
(!contains(matrix.platform.target, 'wasm32') || matrix.toolchain == 'nightly') && (!contains(matrix.platform.target, 'wasm32') || matrix.toolchain == 'nightly') &&
!contains(matrix.platform.target, 'redox') && !contains(matrix.platform.target, 'redox') &&
matrix.toolchain != '1.85' matrix.toolchain != '1.86'
run: cargo $CMD test $OPTIONS $TEST_OPTIONS --features serde run: cargo $CMD test $OPTIONS $TEST_OPTIONS --features serde
- name: Check docs.rs documentation - name: Check docs.rs documentation

2
Cargo.toml
View File

@@ -7,7 +7,7 @@ resolver = "3"
edition = "2024" edition = "2024"
license = "Apache-2.0" license = "Apache-2.0"
repository = "https://github.com/rust-windowing/winit" repository = "https://github.com/rust-windowing/winit"
rust-version = "1.85" rust-version = "1.86"
version = "0.31.0-beta.2" version = "0.31.0-beta.2"
[workspace.dependencies] [workspace.dependencies]

2
README.md
View File

@@ -39,7 +39,7 @@ For contributing guidelines see [CONTRIBUTING.md](./CONTRIBUTING.md).
## MSRV Policy ## MSRV Policy
This crate's Minimum Supported Rust Version (MSRV) is **1.85**. Changes to This crate's Minimum Supported Rust Version (MSRV) is **1.86**. Changes to
the MSRV will be accompanied by a minor version bump. the MSRV will be accompanied by a minor version bump.
As a **tentative** policy, the upper bound of the MSRV is given by the following As a **tentative** policy, the upper bound of the MSRV is given by the following

4
winit-win32/src/dnd.rs
View File

@@ -664,7 +664,7 @@ fn pick_effect(actions: &[DndAction], key_state: u32, source_allowed: u32) -> u3
} }
// If holding a modifier would result in no valid values, ignore // If holding a modifier would result in no valid values, ignore
// Need to use filter instead of if-let chains for 1.85 compatibility. // Need to use filter instead of if-let chains for 1.86 compatibility.
if let Some(new_allowed) = if let Some(new_allowed) =
NonZeroU32::new(allowed & !DROPEFFECT_MOVE).filter(|_| key_state & MK_CONTROL != 0) NonZeroU32::new(allowed & !DROPEFFECT_MOVE).filter(|_| key_state & MK_CONTROL != 0)
{ {
@@ -672,7 +672,7 @@ fn pick_effect(actions: &[DndAction], key_state: u32, source_allowed: u32) -> u3
} }
// If holding a modifier would result in no valid values, ignore // If holding a modifier would result in no valid values, ignore
// Need to use filter instead of if-let chains for 1.85 compatibility. // Need to use filter instead of if-let chains for 1.86 compatibility.
if let Some(new_allowed) = if let Some(new_allowed) =
NonZeroU32::new(allowed & !DROPEFFECT_COPY).filter(|_| key_state & MK_SHIFT != 0) NonZeroU32::new(allowed & !DROPEFFECT_COPY).filter(|_| key_state & MK_SHIFT != 0)
{ {

2
winit/src/changelog/v0.31.md
View File

@@ -73,7 +73,7 @@
- `ActiveEventLoop::create_window` now returns `Box<dyn Window>`. - `ActiveEventLoop::create_window` now returns `Box<dyn Window>`.
- `ApplicationHandler` now uses `dyn ActiveEventLoop`. - `ApplicationHandler` now uses `dyn ActiveEventLoop`.
- On Web, let events wake up event loop immediately when using `ControlFlow::Poll`. - On Web, let events wake up event loop immediately when using `ControlFlow::Poll`.
- Bump MSRV from `1.70` to `1.85`. - Bump MSRV from `1.70` to `1.86`.
- Changed `ApplicationHandler::user_event` to `user_wake_up`, removing the - Changed `ApplicationHandler::user_event` to `user_wake_up`, removing the
generic user event. generic user event.