Bump MSRV to 1.85

This package doesn't build with dependencies from bookworm (currently
oldstable) any more.

And, in our MSRV test, test the actual MSRV compiler.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b0949bf4a06de33788b63445b39c3b742a4126d7..b5144e2f36751baa0c31d9a29b4bae6dc89bc771 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,7 +119,10 @@ minimal-versions-nightly:
 # We have a thought-to-be-known-working lockfile in tree, test that
 minimal-versions-pinned:
   stage: test
-  image: "rust:bookworm"
+  # Rust 1.85 was released *with* trixie, but there are no Rust upstream
+  # images for 1.85 based *on* trixie (which would have been testing
+  # at that time).
+  image: "rust:1.85.1-bookworm"
   script:
     - apt-get -y update
     - apt-get -y install build-essential pkg-config libssl-dev

diff --git a/Cargo.toml b/Cargo.toml
index b62dc6a019086acdb519102d23e904fd0a651900..e0452a77c4a540b71d9fa4a69384f9dff6a04e48 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 # ^ Actually, it's WITH LicenseRef-Hippotat-OpenSSL-Exception
 repository="https://salsa.debian.org/iwj/hippotat"
 homepage="https://www.chiark.greenend.org.uk/~ianmdlvl/hippotat/current/docs/"
-rust-version = "1.63"
+rust-version = "1.85"
 
 [workspace]
 members = ["macros"]