From b8f343b6bf3d26170ec36e7cad9d6878c433baa0 Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Thu, 11 Jul 2019 11:11:27 -0600 Subject: [PATCH] Raise MSRV to 1.31.0 One of our dependencies, fuchsia-cprng, now requires 1.31.0. --- .cirrus.yml | 2 +- .travis.yml | 50 +++++++++++++++++++++++++------------------------- CHANGELOG.md | 2 +- README.md | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 469f206822..db1a90ada9 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -14,7 +14,7 @@ task: setup_script: - pkg install -y curl - curl https://sh.rustup.rs -sSf --output rustup.sh - - sh rustup.sh -y --default-toolchain 1.27.0 + - sh rustup.sh -y --default-toolchain 1.31.0 - $HOME/.cargo/bin/rustup target add i686-unknown-freebsd amd64_test_script: - . $HOME/.cargo/env diff --git a/.travis.yml b/.travis.yml index a48c0757f9..49d13264e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,71 +18,71 @@ matrix: # week. Additionally they're moved to the front of the line to get them in # the Travis OS X build queue first. - env: TARGET="aarch64-apple-ios;armv7-apple-ios;armv7s-apple-ios;i386-apple-ios;x86_64-apple-ios" DISABLE_TESTS=1 - rust: 1.27.0 + rust: 1.31.0 os: osx # Mac builds # These are also moved to be first because they wait in a long queue with # Travis - env: TARGET=i686-apple-darwin - rust: 1.27.0 + rust: 1.31.0 os: osx - env: TARGET=x86_64-apple-darwin - rust: 1.27.0 + rust: 1.31.0 os: osx # Android - env: TARGET=aarch64-linux-android DISABLE_TESTS=1 - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=arm-linux-androideabi DISABLE_TESTS=1 - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1 - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=i686-linux-android DISABLE_TESTS=1 - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=x86_64-linux-android DISABLE_TESTS=1 - rust: 1.27.0 + rust: 1.31.0 # Linux - env: TARGET=aarch64-unknown-linux-gnu - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=arm-unknown-linux-gnueabi - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=arm-unknown-linux-musleabi DISABLE_TESTS=1 - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=armv7-unknown-linux-gnueabihf - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=i686-unknown-linux-gnu - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=i686-unknown-linux-musl - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=mips-unknown-linux-gnu - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=mips64-unknown-linux-gnuabi64 - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=mips64el-unknown-linux-gnuabi64 - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=mipsel-unknown-linux-gnu - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=powerpc-unknown-linux-gnu DISABLE_TESTS=1 - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=powerpc64-unknown-linux-gnu - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=powerpc64le-unknown-linux-gnu - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=s390x-unknown-linux-gnu DISABLE_TESTS=1 - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=x86_64-unknown-linux-gnu - rust: 1.27.0 + rust: 1.31.0 - env: TARGET=x86_64-unknown-linux-musl - rust: 1.27.0 + rust: 1.31.0 # *BSD # FreeBSD i686 and x86_64 use Cirrus instead of Travis # - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1 # - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1 - env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1 - rust: 1.27.0 + rust: 1.31.0 # Make sure stable is always working too - env: TARGET=x86_64-unknown-linux-gnu diff --git a/CHANGELOG.md b/CHANGELOG.md index fa04eae797..b6c4b28ece 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed - Support for `ifaddrs` now present when building for Android. ([#1077](https://github.com/nix-rust/nix/pull/1077)) -- Minimum supported Rust version is now 1.27.0 +- Minimum supported Rust version is now 1.31.0 ([#1035](https://github.com/nix-rust/nix/pull/1035)) ([#1095](https://github.com/nix-rust/nix/pull/1095)) - Now functions `statfs()` and `fstatfs()` return result with `Statfs` wrapper diff --git a/README.md b/README.md index cb6106dfc8..8d8fd72908 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ Tier 2: ## Usage -`nix` requires Rust 1.27.0 or newer. +`nix` requires Rust 1.31.0 or newer. To use `nix`, first add this to your `Cargo.toml`: