Merge remote-tracking branch 'origin/master' into accept-encoding

2022-01-01 09:00:12 +00:00 · 2022-01-01 09:00:12 +00:00 · a53479eee6
parent d9204f996c b708924590
commit a53479eee6
42 changed files with 274 additions and 118 deletions
--- 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
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -16,9 +16,8 @@ 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

    name: ${{ matrix.target.name }} / ${{ matrix.version }}
    runs-on: ${{ matrix.target.os }}
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,6 +1,21 @@
 # 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.
+
+### 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]
 - `ServiceRequest::guard_ctx` for obtaining a guard context. [#2552]
@ -10,7 +25,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]
 - `AcceptEncoding::preference` now returns `Option<Preference<Encoding>>`. [#2501]

--- 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.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"]
@ -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 }
@ -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"] }
@ -107,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.15", features = ["openssl"] }
+awc = { version = "3.0.0-beta.17", features = ["openssl"] }

 brotli2 = "0.3.2"
 criterion = { version = "0.3", features = ["html_reports"] }
--- a/README.md
+++ b/README.md
@ -6,12 +6,12 @@
  <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)
-[![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
+[![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.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.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)
@ -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

--- a/actix-files/CHANGES.md
+++ b/actix-files/CHANGES.md
@ -1,10 +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`.


 ## 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
--- 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>",
@ -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.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.16"
+actix-web = "4.0.0-beta.18"
--- 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)
-[![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
+[![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.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.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)

@ -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
--- 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
--- 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.17", 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.18", default-features = false, features = ["cookies"] }
 actix-http = "3.0.0-beta.17"
--- 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
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@ -10,6 +10,7 @@
 ### Changed
 - `Quality::MIN` is now the smallest non-zero value. [#2501]
 - `QualityItem::min` has different semantics due to the `QualityItem::MIN` change. [#2501]
+- Minimum supported Rust version (MSRV) is now 1.54.

 [#2501]: https://github.com/actix/actix-web/pull/2501

--- 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.18"

 async-stream = "0.3"
 criterion = { version = "0.3", features = ["html_reports"] }
--- 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

--- 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
--- 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.18", default-features = false }

 bytes = "1"
 derive_more = "0.99.5"
--- 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
--- 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
--- 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
--- 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.18", 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 = [] }
--- 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
--- 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.18", 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.17", default-features = false }

 env_logger = "0.9"
 futures-util = { version = "0.3.7", default-features = false }
--- 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
--- 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
--- 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.18"

 futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
 trybuild = "1"
--- 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

--- 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();
--- 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}`
--- a/awc/CHANGES.md
+++ b/awc/CHANGES.md
@ -1,6 +1,20 @@
 # Changes

 ## Unreleased - 2021-xx-xx
+
+
+## 3.0.0-beta.17 - 2021-12-29
+### Changed
+- 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]
 - `FrozenClientRequest::extra_header` now uses receives an `impl TryIntoHeaderPair`. [#2553]
 - Remove unnecessary `Unpin` bounds on `*::send_stream`. [#2553]
--- 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.17"
 authors = [
    "Nikolay Kim <fafhrd91@gmail.com>",
    "fakeshadow <24548779@qq.com>",
@ -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"] }
@ -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.18", features = ["openssl"] }

 brotli2 = "0.3.2"
 env_logger = "0.9"
--- a/awc/README.md
+++ b/awc/README.md
@ -3,16 +3,16 @@
 > 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.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.15/status.svg)](https://deps.rs/crate/awc/3.0.0-beta.15)
+[![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

 - [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

--- a/clippy.toml
+++ b/clippy.toml
@ -1 +1 @@
-msrv = "1.52"
+msrv = "1.54"
--- 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
--- 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
--- 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,16 @@ 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 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.",
                type_name::<T>(),
+                req.match_name().unwrap_or_else(|| 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 correctly. \
+                View/enable debug logs for more details.",
            ))
        }
    }
--- a/src/error/internal.rs
+++ b/src/error/internal.rs
@ -118,8 +118,7 @@ where

 macro_rules! error_helper {
    ($name:ident, $status:ident) => {
-        paste::paste! {
-            #[doc = "Helper function that wraps any error and generates a `" $status "` response."]
+        #[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
@ -127,7 +126,6 @@ macro_rules! error_helper {
        {
            InternalError::new(err, StatusCode::$status).into()
        }
-        }
    };
 }

--- a/src/guard.rs
+++ b/src/guard.rs
@ -270,23 +270,21 @@ 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."]
+        #[doc = concat!("Creates a guard that matches the `", stringify!($method_const), "` request method.")]
        ///
        /// # Examples
-            #[doc = " The route in this example will only respond to `" $method_const "` requests."]
+        #[doc = concat!("The route in this example will only respond to `", stringify!($method_const), "` requests.")]
        /// ```
        /// use actix_web::{guard, web, HttpResponse};
        ///
        /// web::route()
-      #[doc = "     .guard(guard::" $method_fn "())"]
+        #[doc = concat!("    .guard(guard::", stringify!($method_fn), "())")]
        ///     .to(|| HttpResponse::Ok());
        /// ```
        #[allow(non_snake_case)]
        pub fn $method_fn() -> impl Guard {
            MethodGuard(HttpMethod::$method_const)
        }
-        }
    };
 }

--- 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)
--- 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::{test::TestRequest, web::Data};
+    /// # let req = TestRequest::default().to_http_request();
+    /// # type T = u32;
+    /// let opt_t: Option<&Data<T>> = req.app_data::<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>() {
--- 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)
--- 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)
--- a/src/web.rs
+++ b/src/web.rs
@ -86,24 +86,22 @@ 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."]
+        #[doc = concat!(" Creates a new route with `", stringify!($method_const), "` method guard.")]
        ///
        /// # Examples
-            #[doc = " In this example, one `" $method_const " /{project_id}` route is set up:"]
+        #[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 = "         .route(web::" $method_fn "().to(|| HttpResponse::Ok()))"]
+        #[doc = concat!("         .route(web::", stringify!($method_fn), "().to(|| HttpResponse::Ok()))")]
        ///
        /// );
        /// ```
        pub fn $method_fn() -> Route {
            method(Method::$method_const)
        }
-        }
    };
 }