diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33980e54a..c0d2239db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: strategy: fail-fast: false matrix: - toolchain: [stable, nightly, '1.85'] + toolchain: [stable, nightly, '1.86'] platform: # 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, } @@ -82,13 +82,13 @@ jobs: - toolchain: nightly platform: { name: 'Windows 32bit GNU' } # Android is tested on stable-3 - - toolchain: '1.85' + - toolchain: '1.86' platform: { name: 'Android' } # Redox OS doesn't follow MSRV - - toolchain: '1.85' + - toolchain: '1.86' platform: { name: 'Redox OS' } 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 -- ' } - toolchain: 'nightly' platform: { name: 'Web', target: wasm32-unknown-unknown, os: ubuntu-latest, test-options: -Zdoctest-xcompile } @@ -230,19 +230,19 @@ jobs: - name: Test dpi crate if: > contains(matrix.platform.name, 'Linux 64bit') && - matrix.toolchain != '1.85' + matrix.toolchain != '1.86' run: cargo test -p dpi - name: Check dpi crate (no_std) if: > contains(matrix.platform.name, 'Linux 64bit') && - matrix.toolchain != '1.85' + matrix.toolchain != '1.86' run: cargo check -p dpi --no-default-features - name: Build tests if: > !contains(matrix.platform.target, 'redox') && - matrix.toolchain != '1.85' + matrix.toolchain != '1.86' run: cargo $CMD test --no-run $OPTIONS - name: Run tests @@ -251,7 +251,7 @@ jobs: !contains(matrix.platform.target, 'ios') && (!contains(matrix.platform.target, 'wasm32') || matrix.toolchain == 'nightly') && !contains(matrix.platform.target, 'redox') && - matrix.toolchain != '1.85' + matrix.toolchain != '1.86' run: cargo $CMD test $OPTIONS - name: Lint with clippy @@ -261,7 +261,7 @@ jobs: - name: Build tests with serde enabled if: > !contains(matrix.platform.target, 'redox') && - matrix.toolchain != '1.85' + matrix.toolchain != '1.86' run: cargo $CMD test --no-run $OPTIONS $TEST_OPTIONS --features serde - name: Run tests with serde enabled @@ -270,7 +270,7 @@ jobs: !contains(matrix.platform.target, 'ios') && (!contains(matrix.platform.target, 'wasm32') || matrix.toolchain == 'nightly') && !contains(matrix.platform.target, 'redox') && - matrix.toolchain != '1.85' + matrix.toolchain != '1.86' run: cargo $CMD test $OPTIONS $TEST_OPTIONS --features serde - name: Check docs.rs documentation diff --git a/Cargo.toml b/Cargo.toml index ef05ae1f8..5a49c1952 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ resolver = "3" edition = "2024" license = "Apache-2.0" repository = "https://github.com/rust-windowing/winit" -rust-version = "1.85" +rust-version = "1.86" version = "0.31.0-beta.2" [workspace.dependencies] diff --git a/README.md b/README.md index ac7fa2aef..7a0ef1594 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ For contributing guidelines see [CONTRIBUTING.md](./CONTRIBUTING.md). ## 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. As a **tentative** policy, the upper bound of the MSRV is given by the following diff --git a/winit-win32/src/dnd.rs b/winit-win32/src/dnd.rs index 7401e61b4..f64b99a05 100644 --- a/winit-win32/src/dnd.rs +++ b/winit-win32/src/dnd.rs @@ -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 - // 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) = 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 - // 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) = NonZeroU32::new(allowed & !DROPEFFECT_COPY).filter(|_| key_state & MK_SHIFT != 0) { diff --git a/winit/src/changelog/v0.31.md b/winit/src/changelog/v0.31.md index d64bdd6e5..b206e3f02 100644 --- a/winit/src/changelog/v0.31.md +++ b/winit/src/changelog/v0.31.md @@ -73,7 +73,7 @@ - `ActiveEventLoop::create_window` now returns `Box`. - `ApplicationHandler` now uses `dyn ActiveEventLoop`. - 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 generic user event.