Document MSRV in Cargo.toml.

  - Use Cargo.toml's rust-version field instead of a rust-toolchain
    file. It is more flexible and does not prevent use of newer
    compilers.

8 files changed, 11 insertions, 6 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12be2958..b478e2ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -242,7 +242,7 @@ clippy:
   before_script:
     - *before_script_start
     - apt-get -y install libssl-dev capnproto libsqlite3-dev
-    - rustup override unset
+    - rustup default 1.60.0
     - rustup component add clippy
     - cargo clippy --version
     - *before_script_end
@@ -260,7 +260,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_PACKAGES="-p buffered-reader -p sequoia-openpgp" $MAKE_TOP test
@@ -306,6 +305,7 @@ windows-gnu-nettle:
   before_script:
     # the default before_scipt scriptlet doesn't work on Powershell
     - pacman -S gnupg --noconfirm
+    - rustup default "1.60.0"
     - rustc --version --verbose
     - cargo --version
     - clang -v
@@ -335,6 +335,7 @@ windows-gnu-cng:
       - $CI_PROJECT_NAMESPACE == "sequoia-pgp"
   before_script:
     # the default before_scipt scriptlet doesn't work on Powershell
+    - rustup default "1.60.0"
     - rustc --version --verbose
     - cargo --version
     - clang -v
@@ -360,6 +361,7 @@ windows-msvc-cng:
   before_script:
     # We don't call *before_script_start or *before_script_end as we
     # don't have bash, clang, etc.
+    - rustup default "1.60.0"
     - rustc --version --verbose
     - cargo --version
   script:
@@ -397,8 +399,7 @@ windows-msvc32-cng:
   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/autocrypt/Cargo.toml b/autocrypt/Cargo.toml
index 8cd67b36..8ca78aa5 100644
--- a/autocrypt/Cargo.toml
+++ b/autocrypt/Cargo.toml
@@ -15,6 +15,7 @@ keywords = ["autocrypt", "mua", "opportunistic", "mail", "encryption"]
 categories = ["cryptography", "authentication", "email"]
 license = "LGPL-2.0-or-later"
 edition = "2018"
+rust-version = "1.60"
 
 [badges]
 gitlab = { repository = "sequoia-pgp/sequoia" }
diff --git a/buffered-reader/Cargo.toml b/buffered-reader/Cargo.toml
index a0ca6017..4d3b2719 100644
--- a/buffered-reader/Cargo.toml
+++ b/buffered-reader/Cargo.toml
@@ -13,6 +13,7 @@ repository = "https://gitlab.com/sequoia-pgp/sequoia"
 readme = "README.md"
 license = "LGPL-2.0-or-later"
 edition = "2018"
+rust-version = "1.60"
 
 [badges]
 gitlab = { repository = "sequoia-pgp/sequoia" }
diff --git a/ipc/Cargo.toml b/ipc/Cargo.toml
index 8cfeafb9..93236be1 100644
--- a/ipc/Cargo.toml
+++ b/ipc/Cargo.toml
@@ -14,6 +14,7 @@ repository = "https://gitlab.com/sequoia-pgp/sequoia"
 readme = "README.md"
 license = "LGPL-2.0-or-later"
 edition = "2018"
+rust-version = "1.60"
 
 [badges]
 gitlab = { repository = "sequoia-pgp/sequoia" }
diff --git a/net/Cargo.toml b/net/Cargo.toml
index 96ad9d77..0d1478f0 100644
--- a/net/Cargo.toml
+++ b/net/Cargo.toml
@@ -15,6 +15,7 @@ keywords = ["cryptography", "openpgp", "pgp", "hkp", "keyserver"]
 categories = ["cryptography", "authentication", "email"]
 license = "LGPL-2.0-or-later"
 edition = "2018"
+rust-version = "1.60"
 
 [badges]
 gitlab = { repository = "sequoia-pgp/sequoia" }
diff --git a/openpgp/Cargo.toml b/openpgp/Cargo.toml
index 6b24955d..fe12eb14 100644
--- a/openpgp/Cargo.toml
+++ b/openpgp/Cargo.toml
@@ -20,7 +20,7 @@ keywords = ["cryptography", "openpgp", "pgp", "encryption", "signing"]
 categories = ["cryptography", "authentication", "email"]
 license = "LGPL-2.0-or-later"
 edition = "2018"
-rust-version = "1.56"
+rust-version = "1.60"
 
 [badges]
 gitlab = { repository = "sequoia-pgp/sequoia" }
diff --git a/rust-toolchain b/rust-toolchain
deleted file mode 100644
index 4d5fde5b..00000000
--- a/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-1.60.0
diff --git a/sq/Cargo.toml b/sq/Cargo.toml
index 4086f334..c4c45860 100644
--- a/sq/Cargo.toml
+++ b/sq/Cargo.toml
@@ -22,6 +22,7 @@ keywords = ["cryptography", "openpgp", "pgp", "encryption", "signing"]
 categories = ["cryptography", "authentication", "command-line-utilities"]
 license = "GPL-2.0-or-later"
 edition = "2018"
+rust-version = "1.60"
 
 [badges]
 gitlab = { repository = "sequoia-pgp/sequoia" }