From 6ab416caedb7591b9542f9bfda674a53f89290ec Mon Sep 17 00:00:00 2001 From: Scott Lamb Date: Sat, 25 Aug 2018 06:33:50 -0700 Subject: [PATCH] bump minimum Rust version travis-ci pointed out that building with 1.21 broke with a recent dep upgrade (8c52c36). reffers now uses nested groups of imports, which is a feature introduced with Rust 1.25. Prior to 1.25, it fails as follows: error: expected one of `,` or `as`, found `::` --> /home/travis/.cargo/git/checkouts/reffers-rs-0d00fc7f893338b3/49a4d75/src/arc.rs:6:46 | 6 | use std::sync::atomic::{AtomicUsize, Ordering::SeqCst}; | ^^ expected one of `,` or `as` here --- .travis.yml | 2 +- guide/install-manual.md | 2 +- scripts/script-functions.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a527878..511ace9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: rust rust: - stable - nightly - - 1.21.0 + - 1.25.0 addons: apt: packages: diff --git a/guide/install-manual.md b/guide/install-manual.md index e8413e1..056b9a7 100644 --- a/guide/install-manual.md +++ b/guide/install-manual.md @@ -44,7 +44,7 @@ all non-Rust dependencies: libssl-dev \ pkgconf -Next, you need Rust 1.21+ and Cargo. The easiest way to install them is by +Next, you need Rust 1.25+ and Cargo. The easiest way to install them is by following the instructions at [rustup.rs](https://www.rustup.rs/). Finally, building the UI requires [yarn](https://yarnpkg.com/en/). diff --git a/scripts/script-functions.sh b/scripts/script-functions.sh index c9ded0c..19aba15 100755 --- a/scripts/script-functions.sh +++ b/scripts/script-functions.sh @@ -40,7 +40,7 @@ fi NODE_MIN_VERSION="8" YARN_MIN_VERSION="1.0" CARGO_MIN_VERSION="0.2" -RUSTC_MIN_VERSION="1.21" +RUSTC_MIN_VERSION="1.25" FFMPEG_MIN_VERSION="55.1.101" FFMPEG_RELEASE_VERSION="3.4"