From 87b6392ac9819470172de4f55a81090e74b5a8e1 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@pep.foundation>
Date: Fri, 21 Oct 2022 13:19:11 +0200
Subject: [PATCH] Use cargo and rustc 1.60 or later.

  - Don't use the `rust-toolchain` file to specify the version of
    `cargo` and `rustc` to use.  Instead use `rust-version` in
    `Cargo.toml`.

  - Note: this changes how we choose the tool chain: `rust-version` is
    a minimal version; `rust-toolchain` is an exact version.

  - Use 1.60 as that is what is currently available in Debian testing.

  - Closes #7, #10.
---
 .gitlab-ci.yml | 4 +---
 Cargo.toml     | 1 +
 README.md      | 2 +-
 rust-toolchain | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 rust-toolchain

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81dfd02..3888002 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -109,7 +109,6 @@ rust-stable-armv7:
   before_script:
     - *before_script_start
     - cat .ci/snippet_for_cross_compilation_config.toml >> .cargo/config.toml
-    - rm rust-toolchain
     - *before_script_end
   script:
     - cargo test
@@ -195,8 +194,7 @@ windows-msvc-32:
   before_script:
     # We don't call *before_script_start or *before_script_end as we
     # don't have bash, clang, etc.
-    - rm rust-toolchain
-    - rustup default 1.56.0-x86_64-pc-windows-msvc
+    - rustup default 1.60.0-x86_64-pc-windows-msvc
     - rustup target add i686-pc-windows-msvc
     - rustup show
     - rustc --version --verbose
diff --git a/Cargo.toml b/Cargo.toml
index b028376..dc89021 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,6 +10,7 @@ keywords = ["cryptography", "openpgp", "pgp", "encryption", "signing"]
 categories = ["cryptography", "authentication", "email"]
 license = "GPL-3.0-or-later"
 edition = "2018"
+rust-version = "1.60"
 
 [badges]
 maintenance = { status = "actively-developed" }
diff --git a/README.md b/README.md
index e6080a5..6d83905 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ This library provides an implementation of the [p≡p Engine]'s
 Building
 ========
 
-You need at least version 1.48 of `rustc` and `cargo`.
+You need at least version 1.60 of `rustc` and `cargo`.
 
 You can build this library as follows:
 
diff --git a/rust-toolchain b/rust-toolchain
deleted file mode 100644
index 9db5ea1..0000000
--- a/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-1.48.0
-- 
GitLab