From d98d723f973cf31d0580da036fd0ee1edbd7c492 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Sun, 29 Apr 2018 08:24:19 -0700
Subject: [PATCH] bump rustc version requirements

---
 .appveyor.yml | 2 +-
 .travis.yml   | 8 +-------
 CHANGES.md    | 2 ++
 README.md     | 2 +-
 src/lib.rs    | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index f9e79ce7..4f26315f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -59,4 +59,4 @@ build: false
 
 # Equivalent to Travis' `script` phase
 test_script:
-  - cargo test --no-default-features
+  - cargo test --no-default-features --features="flate2-rust"
diff --git a/.travis.yml b/.travis.yml
index a69ce188..890d7564 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,19 +8,13 @@ cache:
 
 matrix:
   include:
-    - rust: 1.21.0
+    - rust: 1.22.1
     - rust: stable
     - rust: beta
     - rust: nightly
   allow_failures:
     - rust: nightly
 
-#rust:
-#  - 1.21.0
-#  - stable
-#  - beta
-#  - nightly-2018-01-03
-
 env:
   global:
     # - RUSTFLAGS="-C link-dead-code"
diff --git a/CHANGES.md b/CHANGES.md
index fb58d0ae..9d3e0a10 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,8 @@
 
 * Websocket CloseCode Empty/Status is ambiguous #193
 
+* Add Content-Disposition to NamedFile #204
+
 
 ## 0.5.6 (2018-04-24)
 
diff --git a/README.md b/README.md
index ed818d95..34790cd0 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,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.21 or later
+* Minimum supported Rust version: 1.22 or later
 
 ## Example
 
diff --git a/src/lib.rs b/src/lib.rs
index 2efac129..379b5ac4 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.21 or later
+//! * Supported Rust version: 1.22 or later
 
 #![cfg_attr(actix_nightly, feature(
     specialization, // for impl ErrorResponse for std::error::Error