diff options
| author | Nora Widdecke <nora@sequoia-pgp.org> | 2021-04-06 18:45:29 +0200 |
|---|---|---|
| committer | Nora Widdecke <nora@sequoia-pgp.org> | 2021-04-08 10:18:14 +0200 |
| commit | 73414861c2908940fc96c8d638c53ff648a7dfef (patch) | |
| tree | d4f1d8274b126267c6b6c256389e6633bf0f85d9 | |
| parent | 7f3a7dbb489ec6520a5f7fdbd8ac6ccfea9f5999 (diff) | |
Update MSRV to 1.48.0
- Update our MSRV to the one used in Debian bullseye, 1.48.0.
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | openpgp/README.md | 2 | ||||
| -rw-r--r-- | openpgp/tests/for-each-artifact.rs | 6 | ||||
| -rw-r--r-- | rust-toolchain | 2 |
4 files changed, 4 insertions, 14 deletions
@@ -199,7 +199,7 @@ PYTHON=disable`. ## Requirements -To build Sequoia, you need at least Rust 1.46 and a few libraries, +To build Sequoia, you need at least Rust 1.48 and a few libraries, notably the Nettle cryptographic library version 3.4.1 or up. Please see below for OS-specific commands to install the needed libraries: @@ -211,7 +211,7 @@ $ sudo apt install git rustc cargo clang libclang1-9 make pkg-config nettle-dev Notes: - - You need at least rustc version 1.46. The version in Debian 10 + - You need at least rustc version 1.48. The version in Debian 10 (Buster) is too old. The version from Debian 11 (Bullseye) works fine. - You need at least Nettle 3.4.1. Both the versions in Debian 10 (Buster) @@ -280,10 +280,6 @@ pkgs.mkShell { # compilation of -sys packages requires manually setting LIBCLANG_PATH LIBCLANG_PATH = "${pkgs.llvmPackages.libclang}/lib"; - - # Workaround for https://github.com/mozilla/nixpkgs-mozilla/issues/240 - # with Rust 1.46.0 - LD_LIBRARY_PATH = ''${zlib.out}/lib''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}''; } ``` diff --git a/openpgp/README.md b/openpgp/README.md index ac8c6177..7b9782ed 100644 --- a/openpgp/README.md +++ b/openpgp/README.md @@ -90,4 +90,4 @@ support. # Minimum Supported Rust Version (MSRV) -`sequoia-openpgp` requires Rust 1.46. +`sequoia-openpgp` requires Rust 1.48. diff --git a/openpgp/tests/for-each-artifact.rs b/openpgp/tests/for-each-artifact.rs index 30359ba8..4d22840d 100644 --- a/openpgp/tests/for-each-artifact.rs +++ b/openpgp/tests/for-each-artifact.rs @@ -10,12 +10,6 @@ use sequoia_openpgp as openpgp; use crate::openpgp::parse::*; use crate::openpgp::PacketPile; use crate::openpgp::Result; -// Rustc 1.34 thinks SerializeInto is unused, but if we don't import -// it, it correctly complains about no trait being in scope providing -// .to_vec(). This seems to be a compiler bug, because rustc 1.40 -// behaves correctly. Hence, we work around the unused import warning -// until we rise our MSRV. -#[allow(unused_imports)] // XXX: Remove me. use crate::openpgp::serialize::{Serialize, SerializeInto}; mod for_each_artifact { diff --git a/rust-toolchain b/rust-toolchain index 0a3db35b..9db5ea12 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.46.0 +1.48.0 |