meson: Bump the minimum rust version to 1.85.0

Acked-by: Karol Herbst <kherbst@redhat.com>
This commit is contained in:
Faith Ekstrand 2026-05-28 21:14:47 -04:00
parent 4381ac9a91
commit 9d3e633213
3 changed files with 5 additions and 5 deletions

View file

@ -19,10 +19,10 @@ include:
- .gitlab-ci/conditional-build-image-tags.yml
variables:
DEBIAN_BUILD_BASE_TAG: "20250430-imgui.2"
DEBIAN_BUILD_BASE_TAG: "20250528-rust-1.85"
DEBIAN_BUILD_TAG: "20260430-imgui.2"
DEBIAN_TEST_BASE_TAG: "20260502-virgl"
DEBIAN_TEST_BASE_TAG: "20250528-rust-1.85"
DEBIAN_TEST_ANDROID_TAG: "20260526-angle-a7"
DEBIAN_TEST_GL_TAG: "20260526-angle-a7"
DEBIAN_TEST_VIDEO_TAG: "20260512-vkuprev"

View file

@ -1,2 +1,2 @@
# Keep this in sync with the `rustc.version()` check in meson.build
msrv = "1.82.0"
msrv = "1.85.0"

View file

@ -844,8 +844,8 @@ if with_gallium_rusticl or with_nouveau_vk or with_tools.contains('etnaviv') or
rust = import('rust')
# Keep this in sync with the `msrv` in clippy.toml
if rustc.version().version_compare('< 1.82')
error('Mesa requires Rust 1.82.0 or newer')
if rustc.version().version_compare('< 1.85')
error('Mesa requires Rust 1.85.0 or newer')
endif
# bindgen 0.71 is the first version that knows about `editions`