From e0018d0710c61b4714196df7e3a1757b66921659 Mon Sep 17 00:00:00 2001 From: Mads Marquart Date: Fri, 2 Sep 2022 10:59:05 +0200 Subject: [PATCH] Bump MSRV to 1.60 (#2453) --- .github/workflows/ci.yml | 4 ++-- CHANGELOG.md | 1 + CONTRIBUTING.md | 2 +- Cargo.toml | 2 +- src/platform_impl/linux/x11/dnd.rs | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9be4419..1ef43365 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - rust_version: [1.57.0, stable, nightly] + rust_version: ['1.60.0', stable, nightly] platform: # Note: Make sure that we test all the `docs.rs` targets defined in Cargo.toml! - { target: x86_64-pc-windows-msvc, os: windows-latest, } @@ -95,7 +95,7 @@ jobs: - name: Lint with clippy shell: bash - if: (matrix.rust_version == '1.57.0') && !contains(matrix.platform.options, '--no-default-features') + if: (matrix.rust_version == '1.60.0') && !contains(matrix.platform.options, '--no-default-features') run: cargo clippy --all-targets --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES -- -Dwarnings - name: Build tests with serde enabled diff --git a/CHANGELOG.md b/CHANGELOG.md index acc85680..28ad9b35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ And please only add new entries to the top of this list, right below the `# Unre # Unreleased +- **Breaking:** Bump MSRV from `1.57` to `1.60`. - **Breaking:** Split the `platform::unix` module into `platform::x11` and `platform::wayland`. The extension types are similarly renamed. - **Breaking:**: Removed deprecated method `platform::unix::WindowExtUnix::is_ready`. - Removed `parking_lot` dependency. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5c287f14..639d3105 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,7 +20,7 @@ your description of the issue as detailed as possible: When making a code contribution to winit, before opening your pull request, please make sure that: -- your patch builds with Winit's minimal supported rust version - Rust 1.57.0. +- your patch builds with Winit's minimal supported rust version - Rust 1.60. - you tested your modifications on all the platforms impacted, or if not possible detail which platforms were not tested, and what should be tested, so that a maintainer or another contributor can test them - you updated any relevant documentation in winit diff --git a/Cargo.toml b/Cargo.toml index 32a5e714..7236ad26 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ readme = "README.md" repository = "https://github.com/rust-windowing/winit" documentation = "https://docs.rs/winit" categories = ["gui"] -rust-version = "1.57.0" +rust-version = "1.60.0" [package.metadata.docs.rs] features = ["serde"] diff --git a/src/platform_impl/linux/x11/dnd.rs b/src/platform_impl/linux/x11/dnd.rs index 997228cd..ab9ab56c 100644 --- a/src/platform_impl/linux/x11/dnd.rs +++ b/src/platform_impl/linux/x11/dnd.rs @@ -188,7 +188,7 @@ impl Dnd { .get_property(window, self.atoms.selection, self.atoms.uri_list) } - pub fn parse_data(&self, data: &mut Vec) -> Result, DndDataParseError> { + pub fn parse_data(&self, data: &mut [c_uchar]) -> Result, DndDataParseError> { if !data.is_empty() { let mut path_list = Vec::new(); let decoded = percent_decode(data).decode_utf8()?.into_owned();