From f48702042bdd21ed626951a64ebcf8f6375ade6e Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Thu, 24 May 2018 21:09:20 -0700 Subject: [PATCH] min rustc version --- .appveyor.yml | 9 --------- .travis.yml | 7 +++---- CHANGES.md | 2 ++ README.md | 2 +- src/lib.rs | 2 +- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 7933588a3..4bcd77329 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,15 +3,6 @@ environment: PROJECT_NAME: actix matrix: # Stable channel - - TARGET: i686-pc-windows-gnu - CHANNEL: 1.24.0 - - TARGET: i686-pc-windows-msvc - CHANNEL: 1.24.0 - - TARGET: x86_64-pc-windows-gnu - CHANNEL: 1.24.0 - - TARGET: x86_64-pc-windows-msvc - CHANNEL: 1.24.0 - # Stable channel - TARGET: i686-pc-windows-gnu CHANNEL: stable - TARGET: i686-pc-windows-msvc diff --git a/.travis.yml b/.travis.yml index fd9bfc0bf..50dc82f7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ cache: matrix: include: - - rust: 1.25.0 - rust: stable - rust: beta - rust: nightly @@ -31,12 +30,12 @@ before_script: script: - | - if [[ "$TRAVIS_RUST_VERSION" != "1.25.0" ]]; then + if [[ "$TRAVIS_RUST_VERSION" != "stable" ]]; then cargo clean cargo test --features="alpn,tls" -- --nocapture fi - | - if [[ "$TRAVIS_RUST_VERSION" == "1.25.0" ]]; then + if [[ "$TRAVIS_RUST_VERSION" == "stable" ]]; then bash <(curl https://raw.githubusercontent.com/xd009642/tarpaulin/master/travis-install.sh) USE_SKEPTIC=1 cargo tarpaulin --out Xml --no-count bash <(curl -s https://codecov.io/bash) @@ -46,7 +45,7 @@ script: # Upload docs after_success: - | - if [[ "$TRAVIS_OS_NAME" == "linux" && "$TRAVIS_PULL_REQUEST" = "false" && "$TRAVIS_BRANCH" == "master" && "$TRAVIS_RUST_VERSION" == "stable" ]]; then + if [[ "$TRAVIS_OS_NAME" == "linux" && "$TRAVIS_PULL_REQUEST" = "false" && "$TRAVIS_BRANCH" == "master" && "$TRAVIS_RUST_VERSION" == "beta" ]]; then cargo doc --features "alpn, tls, session" --no-deps && echo "" > target/doc/index.html && git clone https://github.com/davisp/ghp-import.git && diff --git a/CHANGES.md b/CHANGES.md index 8fd1689be..c1f164b6e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,8 @@ * Migrate to tokio +* Min rustc version is 1.26 + ## [0.6.10] - 2018-05-24 diff --git a/README.md b/README.md index 9629da4e4..427838c1c 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Actix web is a simple, pragmatic and extremely fast web framework for Rust. * [API Documentation (Releases)](https://docs.rs/actix-web/) * [Chat on gitter](https://gitter.im/actix/actix) * Cargo package: [actix-web](https://crates.io/crates/actix-web) -* Minimum supported Rust version: 1.25 or later +* Minimum supported Rust version: 1.26 or later ## Example diff --git a/src/lib.rs b/src/lib.rs index 4dd1b215c..a428b08bc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -59,7 +59,7 @@ //! * SSL support with OpenSSL or `native-tls` //! * Middlewares (`Logger`, `Session`, `CORS`, `CSRF`, `DefaultHeaders`) //! * Built on top of [Actix actor framework](https://github.com/actix/actix) -//! * Supported Rust version: 1.24 or later +//! * Supported Rust version: 1.26 or later //! //! ## Package feature //!