From 798e9911e948857e15df695a7691df2a146b1120 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Wed, 29 Dec 2021 07:07:46 +0000
Subject: [PATCH 01/12] prepare awc release 3.0.0-beta.16

---
 awc/CHANGES.md | 3 +++
 awc/Cargo.toml | 4 ++--
 awc/README.md  | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/awc/CHANGES.md b/awc/CHANGES.md
index 06e94292a..212469873 100644
--- a/awc/CHANGES.md
+++ b/awc/CHANGES.md
@@ -1,6 +1,9 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+
+
+## 3.0.0-beta.16 - 2021-12-29
 - `*::send_json` and `*::send_form` methods now receive `impl Serialize`. [#2553]
 - `FrozenClientRequest::extra_header` now uses receives an `impl TryIntoHeaderPair`. [#2553]
 - Remove unnecessary `Unpin` bounds on `*::send_stream`. [#2553]
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index 8777ffa74..676a10895 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "awc"
-version = "3.0.0-beta.15"
+version = "3.0.0-beta.16"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "fakeshadow <24548779@qq.com>",
@@ -99,7 +99,7 @@ actix-server = "2.0.0-rc.2"
 actix-test = { version = "0.1.0-beta.10", features = ["openssl", "rustls"] }
 actix-tls = { version = "3.0.0", features = ["openssl", "rustls"] }
 actix-utils = "3.0.0"
-actix-web = { version = "4.0.0-beta.16", features = ["openssl"] }
+actix-web = { version = "4.0.0-beta.17", features = ["openssl"] }
 
 brotli2 = "0.3.2"
 env_logger = "0.9"
diff --git a/awc/README.md b/awc/README.md
index 582ecb18f..4916210e4 100644
--- a/awc/README.md
+++ b/awc/README.md
@@ -3,9 +3,9 @@
 > Async HTTP and WebSocket client library.
 
 [![crates.io](https://img.shields.io/crates/v/awc?label=latest)](https://crates.io/crates/awc)
-[![Documentation](https://docs.rs/awc/badge.svg?version=3.0.0-beta.15)](https://docs.rs/awc/3.0.0-beta.15)
+[![Documentation](https://docs.rs/awc/badge.svg?version=3.0.0-beta.16)](https://docs.rs/awc/3.0.0-beta.16)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/awc)
-[![Dependency Status](https://deps.rs/crate/awc/3.0.0-beta.15/status.svg)](https://deps.rs/crate/awc/3.0.0-beta.15)
+[![Dependency Status](https://deps.rs/crate/awc/3.0.0-beta.16/status.svg)](https://deps.rs/crate/awc/3.0.0-beta.16)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 
 ## Documentation & Resources

From 11d50d792b6569f190f9873f3cee5c5569b75e0f Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Wed, 29 Dec 2021 07:07:51 +0000
Subject: [PATCH 02/12] prepare actix-web release 4.0.0-beta.17

---
 CHANGES.md                   | 5 ++++-
 Cargo.toml                   | 4 ++--
 README.md                    | 4 ++--
 actix-files/Cargo.toml       | 4 ++--
 actix-http-test/Cargo.toml   | 4 ++--
 actix-http/Cargo.toml        | 2 +-
 actix-multipart/Cargo.toml   | 2 +-
 actix-test/Cargo.toml        | 4 ++--
 actix-web-actors/Cargo.toml  | 4 ++--
 actix-web-codegen/Cargo.toml | 2 +-
 10 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b6d3b103d..c870f10e7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,9 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+
+
+## 4.0.0-beta.17 - 2021-12-29
 ### Added
 - `guard::GuardContext` for use with the `Guard` trait. [#2552]
 - `ServiceRequest::guard_ctx` for obtaining a guard context. [#2552]
@@ -8,7 +11,7 @@
 ### Changed
 - `Guard` trait now receives a `&GuardContext`. [#2552]
 - `guard::fn_guard` functions now receives a `&GuardContext`. [#2552]
-- Some guards now return `impl Guard` and their concrete types are made private: `guard::{Header}` and all the method guards. [#2552]
+- Some guards now return `impl Guard` and their concrete types are made private: `guard::Header` and all the method guards. [#2552]
 - The `Not` guard is now generic over the type of guard it wraps. [#2552]
 
 ### Fixed
diff --git a/Cargo.toml b/Cargo.toml
index b6ef184e0..1b85e8e75 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "4.0.0-beta.16"
+version = "4.0.0-beta.17"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust"
 keywords = ["actix", "http", "web", "framework", "async"]
@@ -107,7 +107,7 @@ url = "2.1"
 
 [dev-dependencies]
 actix-test = { version = "0.1.0-beta.10", features = ["openssl", "rustls"] }
-awc = { version = "3.0.0-beta.15", features = ["openssl"] }
+awc = { version = "3.0.0-beta.16", features = ["openssl"] }
 
 brotli2 = "0.3.2"
 criterion = { version = "0.3", features = ["html_reports"] }
diff --git a/README.md b/README.md
index f9d388f8b..afe6b1f8e 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,10 @@
   <p>
 
 [![crates.io](https://img.shields.io/crates/v/actix-web?label=latest)](https://crates.io/crates/actix-web)
-[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.0.0-beta.16)](https://docs.rs/actix-web/4.0.0-beta.16)
+[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.0.0-beta.17)](https://docs.rs/actix-web/4.0.0-beta.17)
 [![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-web.svg)
-[![Dependency Status](https://deps.rs/crate/actix-web/4.0.0-beta.16/status.svg)](https://deps.rs/crate/actix-web/4.0.0-beta.16)
+[![Dependency Status](https://deps.rs/crate/actix-web/4.0.0-beta.17/status.svg)](https://deps.rs/crate/actix-web/4.0.0-beta.17)
 <br />
 [![build status](https://github.com/actix/actix-web/workflows/CI%20%28Linux%29/badge.svg?branch=master&event=push)](https://github.com/actix/actix-web/actions)
 [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web) 
diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml
index bbd4fee22..b7bb3fd07 100644
--- a/actix-files/Cargo.toml
+++ b/actix-files/Cargo.toml
@@ -25,7 +25,7 @@ experimental-io-uring = ["actix-web/experimental-io-uring", "tokio-uring"]
 actix-http = "3.0.0-beta.17"
 actix-service = "2"
 actix-utils = "3"
-actix-web = { version = "4.0.0-beta.16", default-features = false }
+actix-web = { version = "4.0.0-beta.17", default-features = false }
 
 askama_escape = "0.10"
 bitflags = "1"
@@ -44,4 +44,4 @@ tokio-uring = { version = "0.1", optional = true }
 [dev-dependencies]
 actix-rt = "2.2"
 actix-test = "0.1.0-beta.10"
-actix-web = "4.0.0-beta.16"
+actix-web = "4.0.0-beta.17"
diff --git a/actix-http-test/Cargo.toml b/actix-http-test/Cargo.toml
index 5c58978ea..2883a8f7e 100644
--- a/actix-http-test/Cargo.toml
+++ b/actix-http-test/Cargo.toml
@@ -35,7 +35,7 @@ actix-tls = "3.0.0"
 actix-utils = "3.0.0"
 actix-rt = "2.2"
 actix-server = "2.0.0-rc.2"
-awc = { version = "3.0.0-beta.15", default-features = false }
+awc = { version = "3.0.0-beta.16", default-features = false }
 
 base64 = "0.13"
 bytes = "1"
@@ -51,5 +51,5 @@ tls-openssl = { version = "0.10.9", package = "openssl", optional = true }
 tokio = { version = "1.8.4", features = ["sync"] }
 
 [dev-dependencies]
-actix-web = { version = "4.0.0-beta.16", default-features = false, features = ["cookies"] }
+actix-web = { version = "4.0.0-beta.17", default-features = false, features = ["cookies"] }
 actix-http = "3.0.0-beta.17"
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index 9e587890b..9575f55e7 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -82,7 +82,7 @@ zstd = { version = "0.9", optional = true }
 actix-http-test = { version = "3.0.0-beta.10", features = ["openssl"] }
 actix-server = "2.0.0-rc.2"
 actix-tls = { version = "3.0.0", features = ["openssl"] }
-actix-web = "4.0.0-beta.16"
+actix-web = "4.0.0-beta.17"
 
 async-stream = "0.3"
 criterion = { version = "0.3", features = ["html_reports"] }
diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml
index de13133a1..4beddd0b8 100644
--- a/actix-multipart/Cargo.toml
+++ b/actix-multipart/Cargo.toml
@@ -15,7 +15,7 @@ path = "src/lib.rs"
 
 [dependencies]
 actix-utils = "3.0.0"
-actix-web = { version = "4.0.0-beta.16", default-features = false }
+actix-web = { version = "4.0.0-beta.17", default-features = false }
 
 bytes = "1"
 derive_more = "0.99.5"
diff --git a/actix-test/Cargo.toml b/actix-test/Cargo.toml
index c7177a38c..c523a6566 100644
--- a/actix-test/Cargo.toml
+++ b/actix-test/Cargo.toml
@@ -34,8 +34,8 @@ actix-http-test = "3.0.0-beta.10"
 actix-rt = "2.1"
 actix-service = "2.0.0"
 actix-utils = "3.0.0"
-actix-web = { version = "4.0.0-beta.16", default-features = false, features = ["cookies"] }
-awc = { version = "3.0.0-beta.15", default-features = false, features = ["cookies"] }
+actix-web = { version = "4.0.0-beta.17", default-features = false, features = ["cookies"] }
+awc = { version = "3.0.0-beta.16", default-features = false, features = ["cookies"] }
 
 futures-core = { version = "0.3.7", default-features = false, features = ["std"] }
 futures-util = { version = "0.3.7", default-features = false, features = [] }
diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml
index 3b792093a..719c563cb 100644
--- a/actix-web-actors/Cargo.toml
+++ b/actix-web-actors/Cargo.toml
@@ -17,7 +17,7 @@ path = "src/lib.rs"
 actix = { version = "0.12.0", default-features = false }
 actix-codec = "0.4.1"
 actix-http = "3.0.0-beta.17"
-actix-web = { version = "4.0.0-beta.16", default-features = false }
+actix-web = { version = "4.0.0-beta.17", default-features = false }
 
 bytes = "1"
 bytestring = "1"
@@ -28,7 +28,7 @@ tokio = { version = "1.8.4", features = ["sync"] }
 [dev-dependencies]
 actix-rt = "2.2"
 actix-test = "0.1.0-beta.10"
-awc = { version = "3.0.0-beta.15", default-features = false }
+awc = { version = "3.0.0-beta.16", default-features = false }
 
 env_logger = "0.9"
 futures-util = { version = "0.3.7", default-features = false }
diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml
index 5250baa90..b014a47ae 100644
--- a/actix-web-codegen/Cargo.toml
+++ b/actix-web-codegen/Cargo.toml
@@ -25,7 +25,7 @@ actix-macros = "0.2.3"
 actix-rt = "2.2"
 actix-test = "0.1.0-beta.10"
 actix-utils = "3.0.0"
-actix-web = "4.0.0-beta.16"
+actix-web = "4.0.0-beta.17"
 
 futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
 trybuild = "1"

From 9779010a5af14a7ccbe3668280f117de5345769a Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Wed, 29 Dec 2021 07:08:10 +0000
Subject: [PATCH 03/12] prepare actix-files release 0.6.0-beta.12

---
 actix-files/CHANGES.md | 4 ++++
 actix-files/Cargo.toml | 2 +-
 actix-files/README.md  | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/actix-files/CHANGES.md b/actix-files/CHANGES.md
index af6dcb415..65007c955 100644
--- a/actix-files/CHANGES.md
+++ b/actix-files/CHANGES.md
@@ -3,6 +3,10 @@
 ## Unreleased - 2021-xx-xx
 
 
+## 0.6.0-beta.12 - 2021-12-29
+* No significant changes since `0.6.0-beta.11`.
+
+
 ## 0.6.0-beta.11 - 2021-12-27
 * No significant changes since `0.6.0-beta.10`.
 
diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml
index b7bb3fd07..adf4408ba 100644
--- a/actix-files/Cargo.toml
+++ b/actix-files/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-files"
-version = "0.6.0-beta.11"
+version = "0.6.0-beta.12"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "fakeshadow <24548779@qq.com>",
diff --git a/actix-files/README.md b/actix-files/README.md
index db5c94d1e..3f310a607 100644
--- a/actix-files/README.md
+++ b/actix-files/README.md
@@ -3,11 +3,11 @@
 > Static file serving for Actix Web
 
 [![crates.io](https://img.shields.io/crates/v/actix-files?label=latest)](https://crates.io/crates/actix-files)
-[![Documentation](https://docs.rs/actix-files/badge.svg?version=0.6.0-beta.11)](https://docs.rs/actix-files/0.6.0-beta.11)
+[![Documentation](https://docs.rs/actix-files/badge.svg?version=0.6.0-beta.12)](https://docs.rs/actix-files/0.6.0-beta.12)
 [![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
 ![License](https://img.shields.io/crates/l/actix-files.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-files/0.6.0-beta.11/status.svg)](https://deps.rs/crate/actix-files/0.6.0-beta.11)
+[![dependency status](https://deps.rs/crate/actix-files/0.6.0-beta.12/status.svg)](https://deps.rs/crate/actix-files/0.6.0-beta.12)
 [![Download](https://img.shields.io/crates/d/actix-files.svg)](https://crates.io/crates/actix-files)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 

From a87e01f0d139836e1d738529f67da8ec9e1059ed Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Wed, 29 Dec 2021 08:59:15 +0000
Subject: [PATCH 04/12] bump msrv to 1.54

---
 .github/workflows/ci.yml                      |  2 +-
 CHANGES.md                                    |  2 ++
 Cargo.toml                                    |  1 -
 README.md                                     |  4 +--
 actix-files/CHANGES.md                        |  5 +--
 actix-files/README.md                         |  4 +--
 actix-http-test/CHANGES.md                    |  1 +
 actix-http-test/README.md                     |  4 +--
 actix-http/CHANGES.md                         |  1 +
 actix-http/README.md                          |  4 +--
 actix-multipart/CHANGES.md                    |  3 +-
 actix-multipart/README.md                     |  4 +--
 actix-router/CHANGES.md                       |  1 +
 actix-test/CHANGES.md                         |  3 +-
 actix-web-actors/CHANGES.md                   |  3 +-
 actix-web-actors/README.md                    |  4 +--
 actix-web-codegen/CHANGES.md                  |  1 +
 actix-web-codegen/README.md                   |  4 +--
 actix-web-codegen/tests/trybuild.rs           |  2 +-
 .../trybuild/route-missing-method-fail.stderr |  6 ++--
 awc/README.md                                 |  2 +-
 clippy.toml                                   |  2 +-
 scripts/bump                                  |  2 +-
 src/error/internal.rs                         | 16 ++++------
 src/guard.rs                                  | 30 ++++++++---------
 src/lib.rs                                    |  2 +-
 src/web.rs                                    | 32 +++++++++----------
 27 files changed, 74 insertions(+), 71 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fe464bf27..2689804f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
           - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
           - { name: Windows, os: windows-2022, triple: x86_64-pc-windows-msvc }
         version:
-          - 1.52.0 # MSRV
+          - 1.54.0 # MSRV
           - stable
           - nightly
 
diff --git a/CHANGES.md b/CHANGES.md
index c870f10e7..83efa6f3b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,8 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+### Changed
+- Minimum supported Rust version (MSRV) is now 1.54.
 
 
 ## 4.0.0-beta.17 - 2021-12-29
diff --git a/Cargo.toml b/Cargo.toml
index 1b85e8e75..44c58e494 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -94,7 +94,6 @@ language-tags = "0.3"
 once_cell = "1.5"
 log = "0.4"
 mime = "0.3"
-paste = "1"
 pin-project-lite = "0.2.7"
 regex = "1.4"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/README.md b/README.md
index afe6b1f8e..aac7818bd 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-web?label=latest)](https://crates.io/crates/actix-web)
 [![Documentation](https://docs.rs/actix-web/badge.svg?version=4.0.0-beta.17)](https://docs.rs/actix-web/4.0.0-beta.17)
-[![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
+[![Version](https://img.shields.io/badge/rustc-1.54+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.54.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-web.svg)
 [![Dependency Status](https://deps.rs/crate/actix-web/4.0.0-beta.17/status.svg)](https://deps.rs/crate/actix-web/4.0.0-beta.17)
 <br />
@@ -32,7 +32,7 @@
 - SSL support using OpenSSL or Rustls
 - Middlewares ([Logger, Session, CORS, etc](https://actix.rs/docs/middleware/))
 - Includes an async [HTTP client](https://docs.rs/awc/)
-- Runs on stable Rust 1.52+
+- Runs on stable Rust 1.54+
 
 ## Documentation
 
diff --git a/actix-files/CHANGES.md b/actix-files/CHANGES.md
index 65007c955..c626fd3fb 100644
--- a/actix-files/CHANGES.md
+++ b/actix-files/CHANGES.md
@@ -1,14 +1,15 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+- Minimum supported Rust version (MSRV) is now 1.54.
 
 
 ## 0.6.0-beta.12 - 2021-12-29
-* No significant changes since `0.6.0-beta.11`.
+- No significant changes since `0.6.0-beta.11`.
 
 
 ## 0.6.0-beta.11 - 2021-12-27
-* No significant changes since `0.6.0-beta.10`.
+- No significant changes since `0.6.0-beta.10`.
 
 
 ## 0.6.0-beta.10 - 2021-12-11
diff --git a/actix-files/README.md b/actix-files/README.md
index 3f310a607..41dd714d3 100644
--- a/actix-files/README.md
+++ b/actix-files/README.md
@@ -4,7 +4,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-files?label=latest)](https://crates.io/crates/actix-files)
 [![Documentation](https://docs.rs/actix-files/badge.svg?version=0.6.0-beta.12)](https://docs.rs/actix-files/0.6.0-beta.12)
-[![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
+[![Version](https://img.shields.io/badge/rustc-1.54+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.54.0.html)
 ![License](https://img.shields.io/crates/l/actix-files.svg)
 <br />
 [![dependency status](https://deps.rs/crate/actix-files/0.6.0-beta.12/status.svg)](https://deps.rs/crate/actix-files/0.6.0-beta.12)
@@ -15,4 +15,4 @@
 
 - [API Documentation](https://docs.rs/actix-files/)
 - [Example Project](https://github.com/actix/examples/tree/master/basics/static_index)
-- Minimum Supported Rust Version (MSRV): 1.52
+- Minimum Supported Rust Version (MSRV): 1.54
diff --git a/actix-http-test/CHANGES.md b/actix-http-test/CHANGES.md
index 8c6a63b72..e83e95bd3 100644
--- a/actix-http-test/CHANGES.md
+++ b/actix-http-test/CHANGES.md
@@ -1,6 +1,7 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+- Minimum supported Rust version (MSRV) is now 1.54.
 
 
 ## 3.0.0-beta.10 - 2021-12-27
diff --git a/actix-http-test/README.md b/actix-http-test/README.md
index 589c54c23..e2cdc0ba2 100644
--- a/actix-http-test/README.md
+++ b/actix-http-test/README.md
@@ -4,7 +4,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-http-test?label=latest)](https://crates.io/crates/actix-http-test)
 [![Documentation](https://docs.rs/actix-http-test/badge.svg?version=3.0.0-beta.10)](https://docs.rs/actix-http-test/3.0.0-beta.10)
-[![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
+[![Version](https://img.shields.io/badge/rustc-1.54+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.54.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http-test)
 <br>
 [![Dependency Status](https://deps.rs/crate/actix-http-test/3.0.0-beta.10/status.svg)](https://deps.rs/crate/actix-http-test/3.0.0-beta.10)
@@ -14,4 +14,4 @@
 ## Documentation & Resources
 
 - [API Documentation](https://docs.rs/actix-http-test)
-- Minimum Supported Rust Version (MSRV): 1.52
+- Minimum Supported Rust Version (MSRV): 1.54
diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index d74a754ac..6911d9969 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -1,6 +1,7 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+- Minimum supported Rust version (MSRV) is now 1.54.
 
 
 ## 3.0.0-beta.17 - 2021-12-27
diff --git a/actix-http/README.md b/actix-http/README.md
index 223e18ceb..084753ac9 100644
--- a/actix-http/README.md
+++ b/actix-http/README.md
@@ -4,7 +4,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-http?label=latest)](https://crates.io/crates/actix-http)
 [![Documentation](https://docs.rs/actix-http/badge.svg?version=3.0.0-beta.17)](https://docs.rs/actix-http/3.0.0-beta.17)
-[![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
+[![Version](https://img.shields.io/badge/rustc-1.54+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.54.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http.svg)
 <br />
 [![dependency status](https://deps.rs/crate/actix-http/3.0.0-beta.17/status.svg)](https://deps.rs/crate/actix-http/3.0.0-beta.17)
@@ -14,7 +14,7 @@
 ## Documentation & Resources
 
 - [API Documentation](https://docs.rs/actix-http)
-- Minimum Supported Rust Version (MSRV): 1.52
+- Minimum Supported Rust Version (MSRV): 1.54
 
 ## Example
 
diff --git a/actix-multipart/CHANGES.md b/actix-multipart/CHANGES.md
index a9a1e8784..65fe51d44 100644
--- a/actix-multipart/CHANGES.md
+++ b/actix-multipart/CHANGES.md
@@ -1,10 +1,11 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+- Minimum supported Rust version (MSRV) is now 1.54.
 
 
 ## 0.4.0-beta.11 - 2021-12-27
-* No significant changes since `0.4.0-beta.10`.
+- No significant changes since `0.4.0-beta.10`.
 
 
 ## 0.4.0-beta.10 - 2021-12-11
diff --git a/actix-multipart/README.md b/actix-multipart/README.md
index a9ee325ba..a773f5d52 100644
--- a/actix-multipart/README.md
+++ b/actix-multipart/README.md
@@ -4,7 +4,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-multipart?label=latest)](https://crates.io/crates/actix-multipart)
 [![Documentation](https://docs.rs/actix-multipart/badge.svg?version=0.4.0-beta.11)](https://docs.rs/actix-multipart/0.4.0-beta.11)
-[![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
+[![Version](https://img.shields.io/badge/rustc-1.54+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.54.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-multipart.svg)
 <br />
 [![dependency status](https://deps.rs/crate/actix-multipart/0.4.0-beta.11/status.svg)](https://deps.rs/crate/actix-multipart/0.4.0-beta.11)
@@ -14,4 +14,4 @@
 ## Documentation & Resources
 
 - [API Documentation](https://docs.rs/actix-multipart)
-- Minimum Supported Rust Version (MSRV): 1.52
+- Minimum Supported Rust Version (MSRV): 1.54
diff --git a/actix-router/CHANGES.md b/actix-router/CHANGES.md
index 0a6a56359..c85d10e2a 100644
--- a/actix-router/CHANGES.md
+++ b/actix-router/CHANGES.md
@@ -1,6 +1,7 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+- Minimum supported Rust version (MSRV) is now 1.54.
 
 
 ## 0.5.0-beta.3 - 2021-12-17
diff --git a/actix-test/CHANGES.md b/actix-test/CHANGES.md
index 2de0a69d6..9838c6f5f 100644
--- a/actix-test/CHANGES.md
+++ b/actix-test/CHANGES.md
@@ -1,10 +1,11 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+- Minimum supported Rust version (MSRV) is now 1.54.
 
 
 ## 0.1.0-beta.10 - 2021-12-27
-* No significant changes since `0.1.0-beta.9`.
+- No significant changes since `0.1.0-beta.9`.
 
 
 ## 0.1.0-beta.9 - 2021-12-17
diff --git a/actix-web-actors/CHANGES.md b/actix-web-actors/CHANGES.md
index 2fbbe7444..5c8091fbb 100644
--- a/actix-web-actors/CHANGES.md
+++ b/actix-web-actors/CHANGES.md
@@ -1,10 +1,11 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+- Minimum supported Rust version (MSRV) is now 1.54.
 
 
 ## 4.0.0-beta.9 - 2021-12-27
-* No significant changes since `4.0.0-beta.8`.
+- No significant changes since `4.0.0-beta.8`.
 
 
 ## 4.0.0-beta.8 - 2021-12-11
diff --git a/actix-web-actors/README.md b/actix-web-actors/README.md
index 232c81eac..0bd007e6a 100644
--- a/actix-web-actors/README.md
+++ b/actix-web-actors/README.md
@@ -4,7 +4,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-web-actors?label=latest)](https://crates.io/crates/actix-web-actors)
 [![Documentation](https://docs.rs/actix-web-actors/badge.svg?version=4.0.0-beta.9)](https://docs.rs/actix-web-actors/4.0.0-beta.9)
-[![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
+[![Version](https://img.shields.io/badge/rustc-1.54+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.54.0.html)
 ![License](https://img.shields.io/crates/l/actix-web-actors.svg)
 <br />
 [![dependency status](https://deps.rs/crate/actix-web-actors/4.0.0-beta.9/status.svg)](https://deps.rs/crate/actix-web-actors/4.0.0-beta.9)
@@ -14,4 +14,4 @@
 ## Documentation & Resources
 
 - [API Documentation](https://docs.rs/actix-web-actors)
-- Minimum Supported Rust Version (MSRV): 1.52
+- Minimum Supported Rust Version (MSRV): 1.54
diff --git a/actix-web-codegen/CHANGES.md b/actix-web-codegen/CHANGES.md
index 0d881d303..5f8c0f259 100644
--- a/actix-web-codegen/CHANGES.md
+++ b/actix-web-codegen/CHANGES.md
@@ -1,6 +1,7 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+- Minimum supported Rust version (MSRV) is now 1.54.
 
 
 ## 0.5.0-beta.6 - 2021-12-11
diff --git a/actix-web-codegen/README.md b/actix-web-codegen/README.md
index f05d3f22c..abb638cee 100644
--- a/actix-web-codegen/README.md
+++ b/actix-web-codegen/README.md
@@ -4,7 +4,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-web-codegen?label=latest)](https://crates.io/crates/actix-web-codegen)
 [![Documentation](https://docs.rs/actix-web-codegen/badge.svg?version=0.5.0-beta.6)](https://docs.rs/actix-web-codegen/0.5.0-beta.6)
-[![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
+[![Version](https://img.shields.io/badge/rustc-1.54+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.54.0.html)
 ![License](https://img.shields.io/crates/l/actix-web-codegen.svg)
 <br />
 [![dependency status](https://deps.rs/crate/actix-web-codegen/0.5.0-beta.6/status.svg)](https://deps.rs/crate/actix-web-codegen/0.5.0-beta.6)
@@ -14,7 +14,7 @@
 ## Documentation & Resources
 
 - [API Documentation](https://docs.rs/actix-web-codegen)
-- Minimum Supported Rust Version (MSRV): 1.52
+- Minimum Supported Rust Version (MSRV): 1.54
 
 ## Compile Testing
 
diff --git a/actix-web-codegen/tests/trybuild.rs b/actix-web-codegen/tests/trybuild.rs
index dd70cb7ca..b2d9ce186 100644
--- a/actix-web-codegen/tests/trybuild.rs
+++ b/actix-web-codegen/tests/trybuild.rs
@@ -1,4 +1,4 @@
-#[rustversion::stable(1.52)] // MSRV
+#[rustversion::stable(1.54)] // MSRV
 #[test]
 fn compile_macros() {
     let t = trybuild::TestCases::new();
diff --git a/actix-web-codegen/tests/trybuild/route-missing-method-fail.stderr b/actix-web-codegen/tests/trybuild/route-missing-method-fail.stderr
index c36b090c0..b1cefafde 100644
--- a/actix-web-codegen/tests/trybuild/route-missing-method-fail.stderr
+++ b/actix-web-codegen/tests/trybuild/route-missing-method-fail.stderr
@@ -1,13 +1,13 @@
 error: The #[route(..)] macro requires at least one `method` attribute
- --> $DIR/route-missing-method-fail.rs:3:1
+ --> tests/trybuild/route-missing-method-fail.rs:3:1
   |
 3 | #[route("/")]
   | ^^^^^^^^^^^^^
   |
-  = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the attribute macro `route` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `fn() -> impl std::future::Future {index}: HttpServiceFactory` is not satisfied
-  --> $DIR/route-missing-method-fail.rs:12:55
+  --> tests/trybuild/route-missing-method-fail.rs:12:55
    |
 12 |     let srv = actix_test::start(|| App::new().service(index));
    |                                                       ^^^^^ the trait `HttpServiceFactory` is not implemented for `fn() -> impl std::future::Future {index}`
diff --git a/awc/README.md b/awc/README.md
index 4916210e4..2f8562181 100644
--- a/awc/README.md
+++ b/awc/README.md
@@ -12,7 +12,7 @@
 
 - [API Documentation](https://docs.rs/awc)
 - [Example Project](https://github.com/actix/examples/tree/HEAD/security/awc_https)
-- Minimum Supported Rust Version (MSRV): 1.52
+- Minimum Supported Rust Version (MSRV): 1.54
 
 ## Example
 
diff --git a/clippy.toml b/clippy.toml
index cef91fde7..ece14b8d2 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -1 +1 @@
-msrv = "1.52"
+msrv = "1.54"
diff --git a/scripts/bump b/scripts/bump
index 43cd8b8c7..1cd190e03 100755
--- a/scripts/bump
+++ b/scripts/bump
@@ -40,7 +40,7 @@ cat "$CHANGELOG_FILE" |
 
 # if word count of changelog chunk is 0 then insert filler changelog chunk
 if [ "$(wc -w "$CHANGE_CHUNK_FILE" | awk '{ print $1 }')" = "0" ]; then
-    echo "* No significant changes since \`$CURRENT_VERSION\`." >"$CHANGE_CHUNK_FILE"
+    echo "- No significant changes since \`$CURRENT_VERSION\`." >"$CHANGE_CHUNK_FILE"
     echo >>"$CHANGE_CHUNK_FILE"
     echo >>"$CHANGE_CHUNK_FILE"
 fi
diff --git a/src/error/internal.rs b/src/error/internal.rs
index 37195dc2e..1c6e343e3 100644
--- a/src/error/internal.rs
+++ b/src/error/internal.rs
@@ -118,15 +118,13 @@ where
 
 macro_rules! error_helper {
     ($name:ident, $status:ident) => {
-        paste::paste! {
-            #[doc = "Helper function that wraps any error and generates a `" $status "` response."]
-            #[allow(non_snake_case)]
-            pub fn $name<T>(err: T) -> Error
-            where
-                T: fmt::Debug + fmt::Display + 'static,
-            {
-                InternalError::new(err, StatusCode::$status).into()
-            }
+        #[doc = concat!("Helper function that wraps any error and generates a `", stringify!($status), "` response.")]
+        #[allow(non_snake_case)]
+        pub fn $name<T>(err: T) -> Error
+        where
+            T: fmt::Debug + fmt::Display + 'static,
+        {
+            InternalError::new(err, StatusCode::$status).into()
         }
     };
 }
diff --git a/src/guard.rs b/src/guard.rs
index ebda69cb9..7a015d2da 100644
--- a/src/guard.rs
+++ b/src/guard.rs
@@ -270,22 +270,20 @@ impl Guard for MethodGuard {
 
 macro_rules! method_guard {
     ($method_fn:ident, $method_const:ident) => {
-        paste::paste! {
-            #[doc = " Creates a guard that matches the `" $method_const "` request method."]
-            ///
-            /// # Examples
-            #[doc = " The route in this example will only respond to `" $method_const "` requests."]
-            /// ```
-            /// use actix_web::{guard, web, HttpResponse};
-            ///
-            /// web::route()
-      #[doc = "     .guard(guard::" $method_fn "())"]
-            ///     .to(|| HttpResponse::Ok());
-            /// ```
-            #[allow(non_snake_case)]
-            pub fn $method_fn() -> impl Guard {
-                MethodGuard(HttpMethod::$method_const)
-            }
+        #[doc = concat!("Creates a guard that matches the `", stringify!($method_const), "` request method.")]
+        ///
+        /// # Examples
+        #[doc = concat!("The route in this example will only respond to `", stringify!($method_const), "` requests.")]
+        /// ```
+        /// use actix_web::{guard, web, HttpResponse};
+        ///
+        /// web::route()
+        #[doc = concat!("    .guard(guard::", stringify!($method_fn), "())")]
+        ///     .to(|| HttpResponse::Ok());
+        /// ```
+        #[allow(non_snake_case)]
+        pub fn $method_fn() -> impl Guard {
+            MethodGuard(HttpMethod::$method_const)
         }
     };
 }
diff --git a/src/lib.rs b/src/lib.rs
index 5f5b915b7..18f0d581d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -53,7 +53,7 @@
 //! * SSL support using OpenSSL or Rustls
 //! * Middlewares ([Logger, Session, CORS, etc](https://actix.rs/docs/middleware/))
 //! * Includes an async [HTTP client](https://docs.rs/awc/)
-//! * Runs on stable Rust 1.52+
+//! * Runs on stable Rust 1.54+
 //!
 //! # Crate Features
 //! * `cookies` - cookies support (enabled by default)
diff --git a/src/web.rs b/src/web.rs
index 47bff36a3..e4339352b 100644
--- a/src/web.rs
+++ b/src/web.rs
@@ -86,23 +86,21 @@ pub fn route() -> Route {
 
 macro_rules! method_route {
     ($method_fn:ident, $method_const:ident) => {
-        paste::paste! {
-            #[doc = " Creates a new route with `" $method_const "` method guard."]
-            ///
-            /// # Examples
-            #[doc = " In this example, one `" $method_const " /{project_id}` route is set up:"]
-            /// ```
-            /// use actix_web::{web, App, HttpResponse};
-            ///
-            /// let app = App::new().service(
-            ///     web::resource("/{project_id}")
-            #[doc = "         .route(web::" $method_fn "().to(|| HttpResponse::Ok()))"]
-            ///
-            /// );
-            /// ```
-            pub fn $method_fn() -> Route {
-                method(Method::$method_const)
-            }
+        #[doc = concat!(" Creates a new route with `", stringify!($method_const), "` method guard.")]
+        ///
+        /// # Examples
+        #[doc = concat!(" In this example, one `", stringify!($method_const), " /{project_id}` route is set up:")]
+        /// ```
+        /// use actix_web::{web, App, HttpResponse};
+        ///
+        /// let app = App::new().service(
+        ///     web::resource("/{project_id}")
+        #[doc = concat!("         .route(web::", stringify!($method_fn), "().to(|| HttpResponse::Ok()))")]
+        ///
+        /// );
+        /// ```
+        pub fn $method_fn() -> Route {
+            method(Method::$method_const)
         }
     };
 }

From 74738c63a728043f3d138f8f5bbbbb4e8c406d77 Mon Sep 17 00:00:00 2001
From: Luca Palmieri <lpalmieri@truelayer.com>
Date: Wed, 29 Dec 2021 11:03:25 +0100
Subject: [PATCH 05/12] Upgrade time dependency (via `cookie`) (#2555)

---
 CHANGES.md     | 2 +-
 Cargo.toml     | 2 +-
 awc/CHANGES.md | 3 ++-
 awc/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 83efa6f3b..d7b8045c7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,9 +2,9 @@
 
 ## Unreleased - 2021-xx-xx
 ### Changed
+- `actix-web` has upgraded to `cookie` 0.16. This removes `actix-web`'s dependency on a version of `time` that was affected by RUSTSEC-2020-0071. `actix-web` still depends on a vulnerable version of `chrono` via `rcgen`, but `rcgen` is only used as a dev dependency therefore this does not affect end users.
 - Minimum supported Rust version (MSRV) is now 1.54.
 
-
 ## 4.0.0-beta.17 - 2021-12-29
 ### Added
 - `guard::GuardContext` for use with the `Guard` trait. [#2552]
diff --git a/Cargo.toml b/Cargo.toml
index 44c58e494..3f91c6f9f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -84,7 +84,7 @@ actix-web-codegen = "0.5.0-beta.6"
 ahash = "0.7"
 bytes = "1"
 cfg-if = "1"
-cookie = { version = "0.15", features = ["percent-encode"], optional = true }
+cookie = { version = "0.16", features = ["percent-encode"], optional = true }
 derive_more = "0.99.5"
 encoding_rs = "0.8"
 futures-core = { version = "0.3.7", default-features = false }
diff --git a/awc/CHANGES.md b/awc/CHANGES.md
index 212469873..0b344b96c 100644
--- a/awc/CHANGES.md
+++ b/awc/CHANGES.md
@@ -1,7 +1,8 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
-
+### Changed
+- `awc` has upgraded to `cookie` 0.16. This removes `awc`'s dependency on a version of `time` that was affected by RUSTSEC-2020-0071. `awc` still depends on a vulnerable version of `chrono` via `rcgen`, but `rcgen` is only used as a dev dependency therefore this does not affect end users.
 
 ## 3.0.0-beta.16 - 2021-12-29
 - `*::send_json` and `*::send_form` methods now receive `impl Serialize`. [#2553]
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index 676a10895..e3a7346b8 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -85,7 +85,7 @@ serde_json = "1.0"
 serde_urlencoded = "0.7"
 tokio = { version = "1.8.4", features = ["sync"] }
 
-cookie = { version = "0.15", features = ["percent-encode"], optional = true }
+cookie = { version = "0.16", features = ["percent-encode"], optional = true }
 
 tls-openssl = { package = "openssl", version = "0.10.9", optional = true }
 tls-rustls = { package = "rustls", version = "0.20.0", optional = true, features = ["dangerous_configuration"] }

From 542c92c9a7f0107ce5e6d6a3f71f34a80eac4b19 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Wed, 29 Dec 2021 10:06:36 +0000
Subject: [PATCH 06/12] tweak changelogs

---
 CHANGES.md     | 9 ++++++++-
 awc/CHANGES.md | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d7b8045c7..9b2a4747a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,9 +2,16 @@
 
 ## Unreleased - 2021-xx-xx
 ### Changed
-- `actix-web` has upgraded to `cookie` 0.16. This removes `actix-web`'s dependency on a version of `time` that was affected by RUSTSEC-2020-0071. `actix-web` still depends on a vulnerable version of `chrono` via `rcgen`, but `rcgen` is only used as a dev dependency therefore this does not affect end users.
+- Update `cookie` dependency (re-exported) to `0.16`. [#2555]
 - Minimum supported Rust version (MSRV) is now 1.54.
 
+### Security
+- `cookie` upgrade addresses [`RUSTSEC-2020-0071`].
+
+[#2555]: https://github.com/actix/actix-web/pull/2555
+[`RUSTSEC-2020-0071`]: https://rustsec.org/advisories/RUSTSEC-2020-0071.html
+
+
 ## 4.0.0-beta.17 - 2021-12-29
 ### Added
 - `guard::GuardContext` for use with the `Guard` trait. [#2552]
diff --git a/awc/CHANGES.md b/awc/CHANGES.md
index 0b344b96c..d01e78a61 100644
--- a/awc/CHANGES.md
+++ b/awc/CHANGES.md
@@ -2,7 +2,14 @@
 
 ## Unreleased - 2021-xx-xx
 ### Changed
-- `awc` has upgraded to `cookie` 0.16. This removes `awc`'s dependency on a version of `time` that was affected by RUSTSEC-2020-0071. `awc` still depends on a vulnerable version of `chrono` via `rcgen`, but `rcgen` is only used as a dev dependency therefore this does not affect end users.
+- Update `cookie` dependency (re-exported) to `0.16`. [#2555]
+
+### Security
+- `cookie` upgrade addresses [`RUSTSEC-2020-0071`].
+
+[#2555]: https://github.com/actix/actix-web/pull/2555
+[`RUSTSEC-2020-0071`]: https://rustsec.org/advisories/RUSTSEC-2020-0071.html
+
 
 ## 3.0.0-beta.16 - 2021-12-29
 - `*::send_json` and `*::send_form` methods now receive `impl Serialize`. [#2553]

From a80e93d6db560de06eb5c238c8b16253e20b929d Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Wed, 29 Dec 2021 10:17:11 +0000
Subject: [PATCH 07/12] prepare actix-web release 4.0.0-beta.18

---
 CHANGES.md                   | 3 +++
 Cargo.toml                   | 2 +-
 README.md                    | 4 ++--
 actix-files/Cargo.toml       | 4 ++--
 actix-http-test/Cargo.toml   | 2 +-
 actix-http/Cargo.toml        | 2 +-
 actix-multipart/Cargo.toml   | 2 +-
 actix-test/Cargo.toml        | 2 +-
 actix-web-actors/Cargo.toml  | 2 +-
 actix-web-codegen/Cargo.toml | 2 +-
 awc/Cargo.toml               | 2 +-
 11 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9b2a4747a..28dd6698b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,9 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+
+
+## 4.0.0-beta.18 - 2021-12-29
 ### Changed
 - Update `cookie` dependency (re-exported) to `0.16`. [#2555]
 - Minimum supported Rust version (MSRV) is now 1.54.
diff --git a/Cargo.toml b/Cargo.toml
index 3f91c6f9f..0d2dfda88 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "4.0.0-beta.17"
+version = "4.0.0-beta.18"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust"
 keywords = ["actix", "http", "web", "framework", "async"]
diff --git a/README.md b/README.md
index aac7818bd..c97748c2f 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,10 @@
   <p>
 
 [![crates.io](https://img.shields.io/crates/v/actix-web?label=latest)](https://crates.io/crates/actix-web)
-[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.0.0-beta.17)](https://docs.rs/actix-web/4.0.0-beta.17)
+[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.0.0-beta.18)](https://docs.rs/actix-web/4.0.0-beta.18)
 [![Version](https://img.shields.io/badge/rustc-1.54+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.54.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-web.svg)
-[![Dependency Status](https://deps.rs/crate/actix-web/4.0.0-beta.17/status.svg)](https://deps.rs/crate/actix-web/4.0.0-beta.17)
+[![Dependency Status](https://deps.rs/crate/actix-web/4.0.0-beta.18/status.svg)](https://deps.rs/crate/actix-web/4.0.0-beta.18)
 <br />
 [![build status](https://github.com/actix/actix-web/workflows/CI%20%28Linux%29/badge.svg?branch=master&event=push)](https://github.com/actix/actix-web/actions)
 [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web) 
diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml
index adf4408ba..c2acbc761 100644
--- a/actix-files/Cargo.toml
+++ b/actix-files/Cargo.toml
@@ -25,7 +25,7 @@ experimental-io-uring = ["actix-web/experimental-io-uring", "tokio-uring"]
 actix-http = "3.0.0-beta.17"
 actix-service = "2"
 actix-utils = "3"
-actix-web = { version = "4.0.0-beta.17", default-features = false }
+actix-web = { version = "4.0.0-beta.18", default-features = false }
 
 askama_escape = "0.10"
 bitflags = "1"
@@ -44,4 +44,4 @@ tokio-uring = { version = "0.1", optional = true }
 [dev-dependencies]
 actix-rt = "2.2"
 actix-test = "0.1.0-beta.10"
-actix-web = "4.0.0-beta.17"
+actix-web = "4.0.0-beta.18"
diff --git a/actix-http-test/Cargo.toml b/actix-http-test/Cargo.toml
index 2883a8f7e..bd6baf743 100644
--- a/actix-http-test/Cargo.toml
+++ b/actix-http-test/Cargo.toml
@@ -51,5 +51,5 @@ tls-openssl = { version = "0.10.9", package = "openssl", optional = true }
 tokio = { version = "1.8.4", features = ["sync"] }
 
 [dev-dependencies]
-actix-web = { version = "4.0.0-beta.17", default-features = false, features = ["cookies"] }
+actix-web = { version = "4.0.0-beta.18", default-features = false, features = ["cookies"] }
 actix-http = "3.0.0-beta.17"
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index 9575f55e7..7c9b28944 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -82,7 +82,7 @@ zstd = { version = "0.9", optional = true }
 actix-http-test = { version = "3.0.0-beta.10", features = ["openssl"] }
 actix-server = "2.0.0-rc.2"
 actix-tls = { version = "3.0.0", features = ["openssl"] }
-actix-web = "4.0.0-beta.17"
+actix-web = "4.0.0-beta.18"
 
 async-stream = "0.3"
 criterion = { version = "0.3", features = ["html_reports"] }
diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml
index 4beddd0b8..715512111 100644
--- a/actix-multipart/Cargo.toml
+++ b/actix-multipart/Cargo.toml
@@ -15,7 +15,7 @@ path = "src/lib.rs"
 
 [dependencies]
 actix-utils = "3.0.0"
-actix-web = { version = "4.0.0-beta.17", default-features = false }
+actix-web = { version = "4.0.0-beta.18", default-features = false }
 
 bytes = "1"
 derive_more = "0.99.5"
diff --git a/actix-test/Cargo.toml b/actix-test/Cargo.toml
index c523a6566..3720869ff 100644
--- a/actix-test/Cargo.toml
+++ b/actix-test/Cargo.toml
@@ -34,7 +34,7 @@ actix-http-test = "3.0.0-beta.10"
 actix-rt = "2.1"
 actix-service = "2.0.0"
 actix-utils = "3.0.0"
-actix-web = { version = "4.0.0-beta.17", default-features = false, features = ["cookies"] }
+actix-web = { version = "4.0.0-beta.18", default-features = false, features = ["cookies"] }
 awc = { version = "3.0.0-beta.16", default-features = false, features = ["cookies"] }
 
 futures-core = { version = "0.3.7", default-features = false, features = ["std"] }
diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml
index 719c563cb..2e96a68ae 100644
--- a/actix-web-actors/Cargo.toml
+++ b/actix-web-actors/Cargo.toml
@@ -17,7 +17,7 @@ path = "src/lib.rs"
 actix = { version = "0.12.0", default-features = false }
 actix-codec = "0.4.1"
 actix-http = "3.0.0-beta.17"
-actix-web = { version = "4.0.0-beta.17", default-features = false }
+actix-web = { version = "4.0.0-beta.18", default-features = false }
 
 bytes = "1"
 bytestring = "1"
diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml
index b014a47ae..03ff4698f 100644
--- a/actix-web-codegen/Cargo.toml
+++ b/actix-web-codegen/Cargo.toml
@@ -25,7 +25,7 @@ actix-macros = "0.2.3"
 actix-rt = "2.2"
 actix-test = "0.1.0-beta.10"
 actix-utils = "3.0.0"
-actix-web = "4.0.0-beta.17"
+actix-web = "4.0.0-beta.18"
 
 futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
 trybuild = "1"
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index e3a7346b8..46a202b8e 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -99,7 +99,7 @@ actix-server = "2.0.0-rc.2"
 actix-test = { version = "0.1.0-beta.10", features = ["openssl", "rustls"] }
 actix-tls = { version = "3.0.0", features = ["openssl", "rustls"] }
 actix-utils = "3.0.0"
-actix-web = { version = "4.0.0-beta.17", features = ["openssl"] }
+actix-web = { version = "4.0.0-beta.18", features = ["openssl"] }
 
 brotli2 = "0.3.2"
 env_logger = "0.9"

From 6df4974234445753e42458df97e940b0949bbb76 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Wed, 29 Dec 2021 10:17:28 +0000
Subject: [PATCH 08/12] prepare awc release 3.0.0-beta.17

---
 Cargo.toml                  | 2 +-
 actix-http-test/Cargo.toml  | 2 +-
 actix-test/Cargo.toml       | 2 +-
 actix-web-actors/Cargo.toml | 2 +-
 awc/CHANGES.md              | 3 +++
 awc/Cargo.toml              | 2 +-
 awc/README.md               | 4 ++--
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0d2dfda88..7abcba5a6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -106,7 +106,7 @@ url = "2.1"
 
 [dev-dependencies]
 actix-test = { version = "0.1.0-beta.10", features = ["openssl", "rustls"] }
-awc = { version = "3.0.0-beta.16", features = ["openssl"] }
+awc = { version = "3.0.0-beta.17", features = ["openssl"] }
 
 brotli2 = "0.3.2"
 criterion = { version = "0.3", features = ["html_reports"] }
diff --git a/actix-http-test/Cargo.toml b/actix-http-test/Cargo.toml
index bd6baf743..d973ce151 100644
--- a/actix-http-test/Cargo.toml
+++ b/actix-http-test/Cargo.toml
@@ -35,7 +35,7 @@ actix-tls = "3.0.0"
 actix-utils = "3.0.0"
 actix-rt = "2.2"
 actix-server = "2.0.0-rc.2"
-awc = { version = "3.0.0-beta.16", default-features = false }
+awc = { version = "3.0.0-beta.17", default-features = false }
 
 base64 = "0.13"
 bytes = "1"
diff --git a/actix-test/Cargo.toml b/actix-test/Cargo.toml
index 3720869ff..e7ac92e2e 100644
--- a/actix-test/Cargo.toml
+++ b/actix-test/Cargo.toml
@@ -35,7 +35,7 @@ actix-rt = "2.1"
 actix-service = "2.0.0"
 actix-utils = "3.0.0"
 actix-web = { version = "4.0.0-beta.18", default-features = false, features = ["cookies"] }
-awc = { version = "3.0.0-beta.16", default-features = false, features = ["cookies"] }
+awc = { version = "3.0.0-beta.17", default-features = false, features = ["cookies"] }
 
 futures-core = { version = "0.3.7", default-features = false, features = ["std"] }
 futures-util = { version = "0.3.7", default-features = false, features = [] }
diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml
index 2e96a68ae..52ffca1ba 100644
--- a/actix-web-actors/Cargo.toml
+++ b/actix-web-actors/Cargo.toml
@@ -28,7 +28,7 @@ tokio = { version = "1.8.4", features = ["sync"] }
 [dev-dependencies]
 actix-rt = "2.2"
 actix-test = "0.1.0-beta.10"
-awc = { version = "3.0.0-beta.16", default-features = false }
+awc = { version = "3.0.0-beta.17", default-features = false }
 
 env_logger = "0.9"
 futures-util = { version = "0.3.7", default-features = false }
diff --git a/awc/CHANGES.md b/awc/CHANGES.md
index d01e78a61..346e95af4 100644
--- a/awc/CHANGES.md
+++ b/awc/CHANGES.md
@@ -1,6 +1,9 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+
+
+## 3.0.0-beta.17 - 2021-12-29
 ### Changed
 - Update `cookie` dependency (re-exported) to `0.16`. [#2555]
 
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index 46a202b8e..9c1f56f64 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "awc"
-version = "3.0.0-beta.16"
+version = "3.0.0-beta.17"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "fakeshadow <24548779@qq.com>",
diff --git a/awc/README.md b/awc/README.md
index 2f8562181..ace2b2eb5 100644
--- a/awc/README.md
+++ b/awc/README.md
@@ -3,9 +3,9 @@
 > Async HTTP and WebSocket client library.
 
 [![crates.io](https://img.shields.io/crates/v/awc?label=latest)](https://crates.io/crates/awc)
-[![Documentation](https://docs.rs/awc/badge.svg?version=3.0.0-beta.16)](https://docs.rs/awc/3.0.0-beta.16)
+[![Documentation](https://docs.rs/awc/badge.svg?version=3.0.0-beta.17)](https://docs.rs/awc/3.0.0-beta.17)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/awc)
-[![Dependency Status](https://deps.rs/crate/awc/3.0.0-beta.16/status.svg)](https://deps.rs/crate/awc/3.0.0-beta.16)
+[![Dependency Status](https://deps.rs/crate/awc/3.0.0-beta.17/status.svg)](https://deps.rs/crate/awc/3.0.0-beta.17)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 
 ## Documentation & Resources

From 231a24ef8d88ad30aeef503fcc00f3d4d5a1973c Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Thu, 30 Dec 2021 07:11:35 +0000
Subject: [PATCH 09/12] improve application data docs

---
 src/app.rs      |  1 +
 src/data.rs     | 46 ++++++++++++++++++++++++++++++----------------
 src/request.rs  | 30 +++++++++++++++++++++++++-----
 src/resource.rs |  1 +
 src/scope.rs    |  1 +
 5 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/src/app.rs b/src/app.rs
index 10868d18d..3fddc055b 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -109,6 +109,7 @@ impl<T> App<T> {
     ///         .route("/", web::get().to(handler))
     /// })
     /// ```
+    #[doc(alias = "manage")]
     pub fn app_data<U: 'static>(mut self, ext: U) -> Self {
         self.extensions.insert(ext);
         self
diff --git a/src/data.rs b/src/data.rs
index ef077e87c..986456ac0 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -19,23 +19,32 @@ pub(crate) trait DataFactory {
 pub(crate) type FnDataFactory =
     Box<dyn Fn() -> LocalBoxFuture<'static, Result<Box<dyn DataFactory>, ()>>>;
 
-/// Application data.
+/// Application data wrapper and extractor.
 ///
-/// Application level data is a piece of arbitrary data attached to the app, scope, or resource.
-/// Application data is available to all routes and can be added during the application
-/// configuration process via `App::data()`.
+/// # Setting Data
+/// Data is set using the `app_data` methods on `App`, `Scope`, and `Resource`. If data is wrapped
+/// in this `Data` type for those calls, it can be used as an extractor.
 ///
-/// Application data can be accessed by using `Data<T>` extractor where `T` is data type.
+/// Note that `Data` should be constructed _outside_ the `HttpServer::new` closure if shared,
+/// potentially mutable state is desired. `Data` is cheap to clone; internally, it uses an `Arc`.
 ///
-/// **Note**: HTTP server accepts an application factory rather than an application instance. HTTP
-/// server constructs an application instance for each thread, thus application data must be
-/// constructed multiple times. If you want to share data between different threads, a shareable
-/// object should be used, e.g. `Send + Sync`. Application data does not need to be `Send`
-/// or `Sync`. Internally `Data` contains an `Arc`.
+/// See also [`App::app_data`](crate::App::app_data), [`Scope::app_data`](crate::Scope::app_data),
+/// and [`Resource::app_data`](crate::Resource::app_data).
+///
+/// # Extracting `Data`
+/// Since the Actix Web router layers application data, the returned object will reference the
+/// "closest" instance of the type. For example, if an `App` stores a `u32`, a nested `Scope`
+/// also stores a `u32`, and the delegated request handler falls within that `Scope`, then
+/// extracting a `web::<Data<u32>>` for that handler will return the `Scope`'s instance.
+/// However, using the same router set up and a request that does not get captured by the `Scope`,
+/// `web::<Data<u32>>` would return the `App`'s instance.
 ///
 /// If route data is not set for a handler, using `Data<T>` extractor would cause a `500 Internal
 /// Server Error` response.
 ///
+/// See also [`HttpRequest::app_data`]
+/// and [`ServiceRequest::app_data`](crate::dev::ServiceRequest::app_data).
+///
 /// # Unsized Data
 /// For types that are unsized, most commonly `dyn T`, `Data` can wrap these types by first
 /// constructing an `Arc<dyn T>` and using the `From` implementation to convert it.
@@ -79,6 +88,7 @@ pub(crate) type FnDataFactory =
 ///     .route("/index.html", web::get().to(index))
 ///     .route("/index-alt.html", web::get().to(index_alt));
 /// ```
+#[doc(alias = "state")]
 #[derive(Debug)]
 pub struct Data<T: ?Sized>(Arc<T>);
 
@@ -90,12 +100,12 @@ impl<T> Data<T> {
 }
 
 impl<T: ?Sized> Data<T> {
-    /// Get reference to inner app data.
+    /// Returns reference to inner `T`.
     pub fn get_ref(&self) -> &T {
         self.0.as_ref()
     }
 
-    /// Convert to the internal Arc<T>
+    /// Unwraps to the internal `Arc<T>`
     pub fn into_inner(self) -> Arc<T> {
         self.0
     }
@@ -143,13 +153,17 @@ impl<T: ?Sized + 'static> FromRequest for Data<T> {
             ok(st.clone())
         } else {
             log::debug!(
-                "Failed to construct App-level Data extractor. \
-                 Request path: {:?} (type: {})",
-                req.path(),
+                "Failed to construct Data extractor type: `{}`. For the Data extractor to work \
+                correctly, wrap the data with `Data::new()` and pass it to `App::app_data()`. \
+                Ensure that types align in both the set and retrieve calls. \
+                Request path: {}",
                 type_name::<T>(),
+                req.path()
             );
+
             err(ErrorInternalServerError(
-                "App data is not configured, to configure construct it with web::Data::new() and pass it to App::app_data()",
+                "Requested application data is not configured. \
+                View/enable debug logs for more details.",
             ))
         }
     }
diff --git a/src/request.rs b/src/request.rs
index b59369317..2580ed12c 100644
--- a/src/request.rs
+++ b/src/request.rs
@@ -266,14 +266,34 @@ impl HttpRequest {
         self.app_state().config()
     }
 
-    /// Get an application data object stored with `App::data` or `App::app_data`
-    /// methods during application configuration.
+    /// Retrieves a piece of application state.
     ///
-    /// If `App::data` was used to store object, use `Data<T>`:
+    /// Extracts any object stored with [`App::app_data()`](crate::App::app_data) (or the
+    /// counterpart methods on [`Scope`](crate::Scope::app_data) and
+    /// [`Resource`](crate::Resource::app_data)) during application configuration.
     ///
-    /// ```ignore
-    /// let opt_t = req.app_data::<Data<T>>();
+    /// Since the Actix Web router layers application data, the returned object will reference the
+    /// "closest" instance of the type. For example, if an `App` stores a `u32`, a nested `Scope`
+    /// also stores a `u32`, and the delegated request handler falls within that `Scope`, then
+    /// calling `.app_data::<u32>()` on an `HttpRequest` within that handler will return the
+    /// `Scope`'s instance. However, using the same router set up and a request that does not get
+    /// captured by the `Scope`, `.app_data::<u32>()` would return the `App`'s instance.
+    ///
+    /// If the state was stored using the [`Data`] wrapper, then it must also be retrieved using
+    /// this same type.
+    ///
+    /// See also the [`Data`] extractor.
+    ///
+    /// # Examples
+    /// ```no_run
+    /// # use actix_web::{web, test::TestRequest};
+    /// # let req = TestRequest::default().to_http_request();
+    /// # type T = u32;
+    /// let opt_t: Option<&T> = req.app_data::<web::Data<T>>();
     /// ```
+    ///
+    /// [`Data`]: crate::web::Data
+    #[doc(alias = "state")]
     pub fn app_data<T: 'static>(&self) -> Option<&T> {
         for container in self.inner.app_data.iter().rev() {
             if let Some(data) = container.get::<T>() {
diff --git a/src/resource.rs b/src/resource.rs
index 564c4d3ef..8da0a8a85 100644
--- a/src/resource.rs
+++ b/src/resource.rs
@@ -195,6 +195,7 @@ where
     ///         .route(web::get().to(handler))
     /// );
     /// ```
+    #[doc(alias = "manage")]
     pub fn app_data<U: 'static>(mut self, data: U) -> Self {
         self.app_data
             .get_or_insert_with(Extensions::new)
diff --git a/src/scope.rs b/src/scope.rs
index b4618bb6c..fa9807f42 100644
--- a/src/scope.rs
+++ b/src/scope.rs
@@ -154,6 +154,7 @@ where
     ///         .route("/", web::get().to(handler))
     /// );
     /// ```
+    #[doc(alias = "manage")]
     pub fn app_data<U: 'static>(mut self, data: U) -> Self {
         self.app_data
             .get_or_insert_with(Extensions::new)

From b4ff6addfe4856aae65ec6b4d4754d5dce49080b Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Thu, 30 Dec 2021 07:15:57 +0000
Subject: [PATCH 10/12] use match name if possible in data debug log

---
 src/data.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/data.rs b/src/data.rs
index 986456ac0..ce7b1fee6 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -153,16 +153,15 @@ impl<T: ?Sized + 'static> FromRequest for Data<T> {
             ok(st.clone())
         } else {
             log::debug!(
-                "Failed to construct Data extractor type: `{}`. For the Data extractor to work \
+                "Failed to extract `Data<{}>` for `{}` handler. For the Data extractor to work \
                 correctly, wrap the data with `Data::new()` and pass it to `App::app_data()`. \
-                Ensure that types align in both the set and retrieve calls. \
-                Request path: {}",
+                Ensure that types align in both the set and retrieve calls.",
                 type_name::<T>(),
-                req.path()
+                req.match_name().unwrap_or_else(|| req.path())
             );
 
             err(ErrorInternalServerError(
-                "Requested application data is not configured. \
+                "Requested application data is not configured correctly. \
                 View/enable debug logs for more details.",
             ))
         }

From 5dcb2502370c2e7a3fa5bc11a338925485dcde4d Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Fri, 31 Dec 2021 07:53:53 +0000
Subject: [PATCH 11/12] fix doc test

---
 README.md      | 2 +-
 src/request.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c97748c2f..3072ba1c0 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-web.svg)
 [![Dependency Status](https://deps.rs/crate/actix-web/4.0.0-beta.18/status.svg)](https://deps.rs/crate/actix-web/4.0.0-beta.18)
 <br />
-[![build status](https://github.com/actix/actix-web/workflows/CI%20%28Linux%29/badge.svg?branch=master&event=push)](https://github.com/actix/actix-web/actions)
+[![CI](https://github.com/actix/actix-web/actions/workflows/ci.yml/badge.svg)](https://github.com/actix/actix-web/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web) 
 ![downloads](https://img.shields.io/crates/d/actix-web.svg)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
diff --git a/src/request.rs b/src/request.rs
index 2580ed12c..cbec70a29 100644
--- a/src/request.rs
+++ b/src/request.rs
@@ -286,10 +286,10 @@ impl HttpRequest {
     ///
     /// # Examples
     /// ```no_run
-    /// # use actix_web::{web, test::TestRequest};
+    /// # use actix_web::{test::TestRequest, web::Data};
     /// # let req = TestRequest::default().to_http_request();
     /// # type T = u32;
-    /// let opt_t: Option<&T> = req.app_data::<web::Data<T>>();
+    /// let opt_t: Option<&Data<T>> = req.app_data::<Data<T>>();
     /// ```
     ///
     /// [`Data`]: crate::web::Data

From b7089245908f19fe03838ae2ef67929960aaee91 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Fri, 31 Dec 2021 08:38:58 +0000
Subject: [PATCH 12/12] only run nightly checks on master ci

---
 .github/workflows/ci-master.yml | 87 +++++++++++++++++++++++++++++++++
 .github/workflows/ci.yml        |  1 -
 2 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 548ec21b7..b78617dc5 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -5,6 +5,93 @@ on:
     branches: [master]
 
 jobs:
+  build_and_test_nightly:
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+          - { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu }
+          - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
+          - { name: Windows, os: windows-2022, triple: x86_64-pc-windows-msvc }
+        version:
+          - nightly
+
+    name: ${{ matrix.target.name }} / ${{ matrix.version }}
+    runs-on: ${{ matrix.target.os }}
+
+    env:
+      CI: 1
+      CARGO_INCREMENTAL: 0
+      VCPKGRS_DYNAMIC: 1
+
+    steps:
+      - uses: actions/checkout@v2
+
+      # install OpenSSL on Windows
+      # TODO: GitHub actions docs state that OpenSSL is
+      # already installed on these Windows machines somewhere
+      - name: Set vcpkg root
+        if: matrix.target.triple == 'x86_64-pc-windows-msvc'
+        run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
+      - name: Install OpenSSL
+        if: matrix.target.triple == 'x86_64-pc-windows-msvc'
+        run: vcpkg install openssl:x64-windows
+
+      - name: Install ${{ matrix.version }}
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.version }}-${{ matrix.target.triple }}
+          profile: minimal
+          override: true
+
+      - name: Generate Cargo.lock
+        uses: actions-rs/cargo@v1
+        with: { command: generate-lockfile }
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.2.0
+
+      - name: Install cargo-hack
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: cargo-hack
+
+      - name: check minimal
+        uses: actions-rs/cargo@v1
+        with: { command: ci-check-min }
+
+      - name: check default
+        uses: actions-rs/cargo@v1
+        with: { command: ci-check-default }
+
+      - name: tests
+        timeout-minutes: 60
+        run: |
+          cargo test --lib --tests -p=actix-router --all-features
+          cargo test --lib --tests -p=actix-http --all-features
+          cargo test --lib --tests -p=actix-web --features=rustls,openssl -- --skip=test_reading_deflate_encoding_large_random_rustls
+          cargo test --lib --tests -p=actix-web-codegen --all-features
+          cargo test --lib --tests -p=awc --all-features
+          cargo test --lib --tests -p=actix-http-test --all-features
+          cargo test --lib --tests -p=actix-test --all-features
+          cargo test --lib --tests -p=actix-files
+          cargo test --lib --tests -p=actix-multipart --all-features
+          cargo test --lib --tests -p=actix-web-actors --all-features
+
+      - name: tests (io-uring)
+        if: matrix.target.os == 'ubuntu-latest'
+        timeout-minutes: 60
+        run: >
+          sudo bash -c "ulimit -Sl 512
+          && ulimit -Hl 512
+          && PATH=$PATH:/usr/share/rust/.cargo/bin
+          && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo test --lib --tests -p=actix-files --all-features"
+
+      - name: Clear the cargo caches
+        run: |
+          cargo install cargo-cache --version 0.6.3 --no-default-features --features ci-autoclean
+          cargo-cache
+
   ci_feature_powerset_check:
     name: Verify Feature Combinations
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2689804f0..f41aa972f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,6 @@ jobs:
         version:
           - 1.54.0 # MSRV
           - stable
-          - nightly
 
     name: ${{ matrix.target.name }} / ${{ matrix.version }}
     runs-on: ${{ matrix.target.os }}