.cargo/config.toml

@@ -0,0 +1,14 @@
+[alias]
+lint = "clippy --workspace --all-targets -- -Dclippy::todo"
+lint-all = "clippy --workspace --all-features --all-targets -- -Dclippy::todo"
+
+# lib checking
+ci-check-min = "hack --workspace check --no-default-features"
+ci-check-default = "hack --workspace check"
+ci-check-default-tests = "check --workspace --tests"
+ci-check-all-feature-powerset="hack --workspace --feature-powerset --skip=__compress,experimental-io-uring check"
+ci-check-all-feature-powerset-linux="hack --workspace --feature-powerset --skip=__compress check"
+
+# testing
+ci-doctest-default = "test --workspace --doc --no-fail-fast -- --nocapture"
+ci-doctest = "test --workspace --all-features --doc --no-fail-fast -- --nocapture"

.clippy.toml

@@ -1,7 +0,0 @@
-disallowed-names = [
-    "e", # no single letter error bindings
-]
-disallowed-methods = [
-    "std::cell::RefCell::default()",
-    "std::rc::Rc::default()",
-]

.cspell.yml

@@ -1,3 +0,0 @@
-version: "0.2"
-words:
-  - actix

.github/workflows/ci-post-merge.yml

@@ -30,10 +30,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install nasm
-        if: matrix.target.os == 'windows-latest'
-        uses: ilammy/setup-nasm@v1.5.2
-
       - name: Install OpenSSL
         if: matrix.target.os == 'windows-latest'
         shell: bash
@@ -44,24 +40,36 @@ jobs:
           echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV
 
       - name: Install Rust (${{ matrix.version.name }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
           toolchain: ${{ matrix.version.version }}
 
-      - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.49.39
+      - name: Install cargo-hack and cargo-ci-cache-clean
+        uses: taiki-e/install-action@v2.26.8
         with:
-          tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
+          tool: cargo-hack,cargo-ci-cache-clean
 
       - name: check minimal
-        run: just check-min
+        run: cargo ci-check-min
 
       - name: check default
-        run: just check-default
+        run: cargo ci-check-default
 
       - name: tests
         timeout-minutes: 60
-        run: just test
+        shell: bash
+        run: |
+          set -e
+          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-0_20,rustls-0_21,rustls-0_22,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: CI cache clean
         run: cargo-ci-cache-clean
@@ -73,19 +81,34 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Free Disk Space
-        run: ./scripts/free-disk-space.sh
+      - name: Install Rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
 
-      - name: Setup mold linker
-        uses: rui314/setup-mold@v1
+      - name: Install cargo-hack
+        uses: taiki-e/install-action@v2.26.8
+        with:
+          tool: cargo-hack
+
+      - name: check feature combinations
+        run: cargo ci-check-all-feature-powerset
+
+      - name: check feature combinations
+        run: cargo ci-check-all-feature-powerset-linux
+
+  nextest:
+    name: nextest
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
 
-      - name: Install just, cargo-hack
-        uses: taiki-e/install-action@v2.49.39
+      - name: Install nextest
+        uses: taiki-e/install-action@v2.26.8
         with:
-          tool: just,cargo-hack
+          tool: nextest
 
-      - name: Check feature combinations
-        run: just check-feature-combinations
+      - name: Test with cargo-nextest
+        run: cargo nextest run

.github/workflows/ci.yml

@@ -16,13 +16,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  read_msrv:
-    name: Read MSRV
-    uses: actions-rust-lang/msrv/.github/workflows/msrv.yml@v0.1.0
-
   build_and_test:
-    needs: read_msrv
-
     strategy:
       fail-fast: false
       matrix:
@@ -32,7 +26,7 @@ jobs:
           - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
           - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
         version:
-          - { name: msrv, version: "${{ needs.read_msrv.outputs.msrv }}" }
+          - { name: msrv, version: 1.68.0 }
           - { name: stable, version: stable }
 
     name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
@@ -41,10 +35,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install nasm
-        if: matrix.target.os == 'windows-latest'
-        uses: ilammy/setup-nasm@v1.5.2
-
       - name: Install OpenSSL
         if: matrix.target.os == 'windows-latest'
         shell: bash
@@ -54,33 +44,46 @@ jobs:
           echo 'OPENSSL_DIR=C:\Program Files\OpenSSL' >> $GITHUB_ENV
           echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV
 
-      - name: Setup mold linker
-        if: matrix.target.os == 'ubuntu-latest'
-        uses: rui314/setup-mold@v1
-
       - name: Install Rust (${{ matrix.version.name }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
           toolchain: ${{ matrix.version.version }}
 
-      - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.49.39
+      - name: Install cargo-hack and cargo-ci-cache-clean
+        uses: taiki-e/install-action@v2.26.8
         with:
-          tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
+          tool: cargo-hack,cargo-ci-cache-clean
 
       - name: workaround MSRV issues
         if: matrix.version.name == 'msrv'
-        run: just downgrade-for-msrv
+        run: |
+          cargo update -p=ciborium --precise=0.2.1
+          cargo update -p=ciborium-ll --precise=0.2.1
+          cargo update -p=clap --precise=4.3.24
+          cargo update -p=clap_lex --precise=0.5.0
+          cargo update -p=anstyle --precise=1.0.2
 
       - name: check minimal
-        run: just check-min
+        run: cargo ci-check-min
 
       - name: check default
-        run: just check-default
+        run: cargo ci-check-default
 
       - name: tests
         timeout-minutes: 60
-        run: just test
+        shell: bash
+        run: |
+          set -e
+          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-0_20,rustls-0_21,rustls-0_22,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: CI cache clean
         run: cargo-ci-cache-clean
@@ -92,7 +95,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
           toolchain: nightly
 
@@ -108,14 +111,10 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
           toolchain: nightly
 
-      - name: Install just
-        uses: taiki-e/install-action@v2.49.39
-        with:
-          tool: just
-
       - name: doc tests
-        run: just test-docs
+        run: cargo ci-doctest
+        timeout-minutes: 60

.github/workflows/coverage.yml

@@ -17,22 +17,21 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+      - name: Install Rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
-          toolchain: nightly
-          components: llvm-tools
+          components: llvm-tools-preview
 
-      - name: Install just, cargo-llvm-cov, cargo-nextest
-        uses: taiki-e/install-action@v2.49.39
+      - name: Install cargo-llvm-cov
+        uses: taiki-e/install-action@v2.26.8
         with:
-          tool: just,cargo-llvm-cov,cargo-nextest
+          tool: cargo-llvm-cov
 
       - name: Generate code coverage
-        run: just test-coverage-codecov
+        run: cargo llvm-cov --workspace --all-features --codecov --output-path codecov.json
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@v4.0.0
         with:
           files: codecov.json
           fail_ci_if_error: true

.github/workflows/lint.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
           toolchain: nightly
           components: rustfmt
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
           components: clippy
 
@@ -55,7 +55,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
           toolchain: nightly
           components: rust-docs
@@ -65,26 +65,29 @@ jobs:
           RUSTDOCFLAGS: -D warnings
         run: cargo +nightly doc --no-deps --workspace --all-features
 
-  check-external-types:
-    if: false # rustdoc mismatch currently
+  public-api-diff:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Install Rust (${{ vars.RUST_VERSION_EXTERNAL_TYPES }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+      - name: Checkout main branch
+        uses: actions/checkout@v4
         with:
-          toolchain: ${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
+          ref: ${{ github.base_ref }}
 
-      - name: Install just
-        uses: taiki-e/install-action@v2.49.39
+      - name: Checkout PR branch
+        uses: actions/checkout@v4
+
+      - name: Install Rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
-          tool: just
+          toolchain: nightly-2023-08-25
 
-      - name: Install cargo-check-external-types
-        uses: taiki-e/cache-cargo-install-action@v2.1.1
+      - name: Install cargo-public-api
+        uses: taiki-e/install-action@v2.26.8
         with:
-          tool: cargo-check-external-types
+          tool: cargo-public-api
 
-      - name: check external types
-        run: just check-external-types-all +${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
+      - name: Generate API diff
+        run: |
+          for f in $(find -mindepth 2 -maxdepth 2 -name Cargo.toml); do
+            cargo public-api --manifest-path "$f" diff ${{ github.event.pull_request.base.sha }}..${{ github.sha }}
+          done

.github/workflows/upload-doc.yml

@@ -0,0 +1,41 @@
+name: Upload Documentation
+
+on:
+  push:
+    branches: [master]
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    permissions:
+      contents: write
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        with:
+          toolchain: nightly
+
+      - name: Build Docs
+        run: cargo +nightly doc --no-deps --workspace --all-features
+        env:
+          RUSTDOCFLAGS: --cfg=docsrs
+
+      - name: Tweak HTML
+        run: echo '<meta http-equiv="refresh" content="0;url=actix_web/index.html">' > target/doc/index.html
+
+      - name: Deploy to GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
+        with:
+          folder: target/doc
+          single-commit: true

.gitignore

@@ -1,3 +1,4 @@
+Cargo.lock
 target/
 guide/build/
 /gh-pages

Cargo.toml

@@ -15,11 +15,9 @@ members = [
 ]
 
 [workspace.package]
-homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-web"
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.75"
+rust-version = "1.68"
 
 [profile.dev]
 # Disabling debug info speeds up builds a bunch and we don't rely on it for debugging that much.
@@ -51,11 +49,3 @@ awc = { path = "awc" }
 # actix-utils = { path = "../actix-net/actix-utils" }
 # actix-tls = { path = "../actix-net/actix-tls" }
 # actix-server = { path = "../actix-net/actix-server" }
-
-[workspace.lints.rust]
-rust_2018_idioms = { level = "deny" }
-future_incompatible = { level = "deny" }
-nonstandard_style = { level = "deny" }
-
-[workspace.lints.clippy]
-# clone_on_ref_ptr = { level = "deny" }

actix-files/CHANGES.md

@@ -2,13 +2,6 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.75.
-
-## 0.6.6
-
-- Update `tokio-uring` dependency to `0.4`.
-- Minimum supported Rust version (MSRV) is now 1.72.
-
 ## 0.6.5
 
 - Fix handling of special characters in filenames.

actix-files/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-files"
-version = "0.6.6"
+version = "0.6.5"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "Rob Ede <robjtede@icloud.com>",
@@ -13,14 +13,9 @@ categories = ["asynchronous", "web-programming::http-server"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
 
-[package.metadata.cargo_check_external_types]
-allowed_external_types = [
-    "actix_http::*",
-    "actix_service::*",
-    "actix_web::*",
-    "http::*",
-    "mime::*",
-]
+[lib]
+name = "actix_files"
+path = "src/lib.rs"
 
 [features]
 experimental-io-uring = ["actix-web/experimental-io-uring", "tokio-uring"]
@@ -33,7 +28,7 @@ actix-web = { version = "4", default-features = false }
 
 bitflags = "2"
 bytes = "1"
-derive_more = { version = "2", features = ["display", "error", "from"] }
+derive_more = "0.99.5"
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 http-range = "0.1.4"
 log = "0.4"
@@ -45,15 +40,12 @@ v_htmlescape = "0.15.5"
 
 # experimental-io-uring
 [target.'cfg(target_os = "linux")'.dependencies]
-tokio-uring = { version = "0.5", optional = true, features = ["bytes"] }
-actix-server = { version = "2.4", optional = true } # ensure matching tokio-uring versions
+tokio-uring = { version = "0.4", optional = true, features = ["bytes"] }
+actix-server = { version = "2.2", optional = true } # ensure matching tokio-uring versions
 
 [dev-dependencies]
 actix-rt = "2.7"
 actix-test = "0.1"
 actix-web = "4"
-env_logger = "0.11"
+env_logger = "0.10"
 tempfile = "3.2"
-
-[lints]
-workspace = true

actix-files/README.md

@@ -3,11 +3,11 @@
 <!-- prettier-ignore-start -->
 
 [![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.6)](https://docs.rs/actix-files/0.6.6)
-![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+[![Documentation](https://docs.rs/actix-files/badge.svg?version=0.6.5)](https://docs.rs/actix-files/0.6.5)
+![Version](https://img.shields.io/badge/rustc-1.68+-ab6000.svg)
 ![License](https://img.shields.io/crates/l/actix-files.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-files/0.6.6/status.svg)](https://deps.rs/crate/actix-files/0.6.6)
+[![dependency status](https://deps.rs/crate/actix-files/0.6.5/status.svg)](https://deps.rs/crate/actix-files/0.6.5)
 [![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)
 

actix-files/src/error.rs

@@ -6,11 +6,11 @@ use derive_more::Display;
 pub enum FilesError {
     /// Path is not a directory.
     #[allow(dead_code)]
-    #[display("path is not a directory. Unable to serve static files")]
+    #[display(fmt = "path is not a directory. Unable to serve static files")]
     IsNotDirectory,
 
     /// Cannot render directory.
-    #[display("unable to render directory without index file")]
+    #[display(fmt = "unable to render directory without index file")]
     IsDirectory,
 }
 
@@ -25,19 +25,19 @@ impl ResponseError for FilesError {
 #[non_exhaustive]
 pub enum UriSegmentError {
     /// Segment started with the wrapped invalid character.
-    #[display("segment started with invalid character: ('{_0}')")]
+    #[display(fmt = "segment started with invalid character: ('{_0}')")]
     BadStart(char),
 
     /// Segment contained the wrapped invalid character.
-    #[display("segment contained invalid character ('{_0}')")]
+    #[display(fmt = "segment contained invalid character ('{_0}')")]
     BadChar(char),
 
     /// Segment ended with the wrapped invalid character.
-    #[display("segment ended with invalid character: ('{_0}')")]
+    #[display(fmt = "segment ended with invalid character: ('{_0}')")]
     BadEnd(char),
 
     /// Path is not a valid UTF-8 string after percent-decoding.
-    #[display("path is not a valid UTF-8 string after percent-decoding")]
+    #[display(fmt = "path is not a valid UTF-8 string after percent-decoding")]
     NotValidUtf8,
 }
 

actix-files/src/lib.rs

@@ -11,7 +11,8 @@
 //!     .service(Files::new("/static", ".").prefer_utf8(true));
 //! ```
 
-#![warn(missing_docs, missing_debug_implementations)]
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible, missing_docs, missing_debug_implementations)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
@@ -74,7 +75,7 @@ mod tests {
         dev::ServiceFactory,
         guard,
         http::{
-            header::{self, ContentDisposition, DispositionParam},
+            header::{self, ContentDisposition, DispositionParam, DispositionType},
             Method, StatusCode,
         },
         middleware::Compress,
@@ -306,11 +307,11 @@ mod tests {
         let resp = file.respond_to(&req);
         assert_eq!(
             resp.headers().get(header::CONTENT_TYPE).unwrap(),
-            "text/javascript",
+            "application/javascript; charset=utf-8"
         );
         assert_eq!(
             resp.headers().get(header::CONTENT_DISPOSITION).unwrap(),
-            "inline; filename=\"test.js\"",
+            "inline; filename=\"test.js\""
         );
     }
 

actix-files/src/service.rs

@@ -79,7 +79,7 @@ impl FilesService {
 
         let (req, _) = req.into_parts();
 
-        (self.renderer)(&dir, &req).unwrap_or_else(|err| ServiceResponse::from_err(err, req))
+        (self.renderer)(&dir, &req).unwrap_or_else(|e| ServiceResponse::from_err(e, req))
     }
 }
 

actix-http-test/CHANGES.md

@@ -2,8 +2,6 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.72.
-
 ## 3.2.0
 
 - Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.

actix-http-test/Cargo.toml

@@ -18,17 +18,9 @@ edition = "2021"
 [package.metadata.docs.rs]
 features = []
 
-[package.metadata.cargo_check_external_types]
-allowed_external_types = [
-    "actix_codec::*",
-    "actix_http::*",
-    "actix_server::*",
-    "awc::*",
-    "bytes::*",
-    "futures_core::*",
-    "http::*",
-    "tokio::*",
-]
+[lib]
+name = "actix_http_test"
+path = "src/lib.rs"
 
 [features]
 default = []
@@ -59,6 +51,3 @@ tokio = { version = "1.24.2", features = ["sync"] }
 
 [dev-dependencies]
 actix-http = "3"
-
-[lints]
-workspace = true

actix-http-test/README.md

@@ -1,10 +1,12 @@
 # `actix-http-test`
 
+> Various helpers for Actix applications to use during testing.
+
 <!-- prettier-ignore-start -->
 
 [![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.2.0)](https://docs.rs/actix-http-test/3.2.0)
-![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+![Version](https://img.shields.io/badge/rustc-1.68+-ab6000.svg)
 ![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.2.0/status.svg)](https://deps.rs/crate/actix-http-test/3.2.0)
@@ -13,8 +15,7 @@
 
 <!-- prettier-ignore-end -->
 
-<!-- cargo-rdme start -->
+## Documentation & Resources
 
-Various helpers for Actix applications to use during testing.
-
-<!-- cargo-rdme end -->
+- [API Documentation](https://docs.rs/actix-http-test)
+- Minimum Supported Rust Version (MSRV): 1.68

actix-http-test/src/lib.rs

@@ -1,5 +1,7 @@
 //! Various helpers for Actix applications to use during testing.
 
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
@@ -106,7 +108,7 @@ pub async fn test_server_with_addr<F: ServerServiceFactory<TcpStream>>(
             builder.set_verify(SslVerifyMode::NONE);
             let _ = builder
                 .set_alpn_protos(b"\x02h2\x08http/1.1")
-                .map_err(|err| log::error!("Can not set ALPN protocol: {err}"));
+                .map_err(|e| log::error!("Can not set alpn protocol: {:?}", e));
 
             Connector::new()
                 .conn_lifetime(Duration::from_secs(0))

actix-http/CHANGES.md

@@ -2,44 +2,6 @@
 
 ## Unreleased
 
-## 3.10.0
-
-### Added
-
-- Add `header::CLEAR_SITE_DATA` constant.
-- Add `Extensions::get_or_insert[_with]()` methods.
-- Implement `From<Bytes>` for `Payload`.
-- Implement `From<Vec<u8>>` for `Payload`.
-
-### Changed
-
-- Update `brotli` dependency to `7`.
-- Minimum supported Rust version (MSRV) is now 1.75.
-
-## 3.9.0
-
-### Added
-
-- Implement `FromIterator<(HeaderName, HeaderValue)>` for `HeaderMap`.
-
-## 3.8.0
-
-### Added
-
-- Add `error::InvalidStatusCode` re-export.
-
-## 3.7.0
-
-### Added
-
-- Add `rustls-0_23` crate feature
-- Add `{h1::H1Service, h2::H2Service, HttpService}::rustls_0_23()` and `HttpService::rustls_0_23_with_config()` service constructors.
-
-### Changed
-
-- Update `brotli` dependency to `6`.
-- Minimum supported Rust version (MSRV) is now 1.72.
-
 ## 3.6.0
 
 ### Added

actix-http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "3.10.0"
+version = "3.6.0"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "Rob Ede <robjtede@icloud.com>",
@@ -28,90 +28,65 @@ features = [
     "rustls-0_20",
     "rustls-0_21",
     "rustls-0_22",
-    "rustls-0_23",
     "compress-brotli",
     "compress-gzip",
     "compress-zstd",
 ]
 
-[package.metadata.cargo_check_external_types]
-allowed_external_types = [
-    "actix_codec::*",
-    "actix_service::*",
-    "actix_tls::*",
-    "actix_utils::*",
-    "bytes::*",
-    "bytestring::*",
-    "encoding_rs::*",
-    "futures_core::*",
-    "h2::*",
-    "http::*",
-    "httparse::*",
-    "language_tags::*",
-    "mime::*",
-    "openssl::*",
-    "rustls::*",
-    "tokio_util::*",
-    "tokio::*",
-]
+[lib]
+name = "actix_http"
+path = "src/lib.rs"
 
 [features]
 default = []
 
 # HTTP/2 protocol support
-http2 = ["dep:h2"]
+http2 = ["h2"]
 
 # WebSocket protocol implementation
 ws = [
-    "dep:local-channel",
-    "dep:base64",
-    "dep:rand",
-    "dep:sha1",
+    "local-channel",
+    "base64",
+    "rand",
+    "sha1",
 ]
 
 # TLS via OpenSSL
-openssl = ["__tls", "actix-tls/accept", "actix-tls/openssl"]
+openssl = ["actix-tls/accept", "actix-tls/openssl"]
 
 # TLS via Rustls v0.20
-rustls = ["__tls", "rustls-0_20"]
+rustls = ["rustls-0_20"]
 
 # TLS via Rustls v0.20
-rustls-0_20 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_20"]
+rustls-0_20 = ["actix-tls/accept", "actix-tls/rustls-0_20"]
 
 # TLS via Rustls v0.21
-rustls-0_21 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_21"]
+rustls-0_21 = ["actix-tls/accept", "actix-tls/rustls-0_21"]
 
 # TLS via Rustls v0.22
-rustls-0_22 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_22"]
-
-# TLS via Rustls v0.23
-rustls-0_23 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_23"]
+rustls-0_22 = ["actix-tls/accept", "actix-tls/rustls-0_22"]
 
 # Compression codecs
-compress-brotli = ["__compress", "dep:brotli"]
-compress-gzip   = ["__compress", "dep:flate2"]
-compress-zstd   = ["__compress", "dep:zstd"]
+compress-brotli = ["__compress", "brotli"]
+compress-gzip   = ["__compress", "flate2"]
+compress-zstd   = ["__compress", "zstd"]
 
 # Internal (PRIVATE!) features used to aid testing and checking feature status.
 # Don't rely on these whatsoever. They are semver-exempt and may disappear at anytime.
 __compress = []
 
-# Internal (PRIVATE!) features used to aid checking feature status.
-# Don't rely on these whatsoever. They may disappear at anytime.
-__tls = []
-
 [dependencies]
 actix-service = "2"
 actix-codec = "0.5"
 actix-utils = "3"
 actix-rt = { version = "2.2", default-features = false }
 
+ahash = "0.8"
 bitflags = "2"
 bytes = "1"
 bytestring = "1"
-derive_more = { version = "2", features = ["as_ref", "deref", "deref_mut", "display", "error", "from"] }
+derive_more = "0.99.5"
 encoding_rs = "0.8"
-foldhash = "0.1"
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 http = "0.2.7"
 httparse = "1.5.1"
@@ -127,62 +102,54 @@ tokio-util = { version = "0.7", features = ["io", "codec"] }
 tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
 # http2
-h2 = { version = "0.3.26", optional = true }
+h2 = { version = "0.3.24", optional = true }
 
 # websockets
 local-channel = { version = "0.1", optional = true }
-base64 = { version = "0.22", optional = true }
-rand = { version = "0.9", optional = true }
+base64 = { version = "0.21", optional = true }
+rand = { version = "0.8", optional = true }
 sha1 = { version = "0.10", optional = true }
 
 # openssl/rustls
-actix-tls = { version = "3.4", default-features = false, optional = true }
+actix-tls = { version = "3.3", default-features = false, optional = true }
 
 # compress-*
-brotli = { version = "7", optional = true }
+brotli = { version = "3.3.3", optional = true }
 flate2 = { version = "1.0.13", optional = true }
 zstd = { version = "0.13", optional = true }
 
 [dev-dependencies]
 actix-http-test = { version = "3", features = ["openssl"] }
 actix-server = "2"
-actix-tls = { version = "3.4", features = ["openssl", "rustls-0_23-webpki-roots"] }
+actix-tls = { version = "3.3", features = ["openssl", "rustls-0_22-webpki-roots"] }
 actix-web = "4"
 
 async-stream = "0.3"
 criterion = { version = "0.5", features = ["html_reports"] }
-divan = "0.1.8"
-env_logger = "0.11"
+env_logger = "0.10"
 futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
 memchr = "2.4"
-once_cell = "1.21"
-rcgen = "0.13"
+once_cell = "1.9"
+rcgen = "0.12"
 regex = "1.3"
 rustversion = "1"
 rustls-pemfile = "2"
-serde = { version = "1", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 static_assertions = "1"
 tls-openssl = { package = "openssl", version = "0.10.55" }
-tls-rustls_023 = { package = "rustls", version = "0.23" }
+tls-rustls_022 = { package = "rustls", version = "0.22" }
 tokio = { version = "1.24.2", features = ["net", "rt", "macros"] }
 
-[lints]
-workspace = true
-
 [[example]]
 name = "ws"
-required-features = ["ws", "rustls-0_23"]
+required-features = ["ws", "rustls-0_22"]
 
 [[example]]
 name = "tls_rustls"
-required-features = ["http2", "rustls-0_23"]
+required-features = ["http2", "rustls-0_22"]
 
 [[bench]]
 name = "response-body-compression"
 harness = false
 required-features = ["compress-brotli", "compress-gzip", "compress-zstd"]
-
-[[bench]]
-name = "date-formatting"
-harness = false

actix-http/README.md

@@ -5,16 +5,21 @@
 <!-- prettier-ignore-start -->
 
 [![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.10.0)](https://docs.rs/actix-http/3.10.0)
-![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.6.0)](https://docs.rs/actix-http/3.6.0)
+![Version](https://img.shields.io/badge/rustc-1.68+-ab6000.svg)
 ![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.10.0/status.svg)](https://deps.rs/crate/actix-http/3.10.0)
+[![dependency status](https://deps.rs/crate/actix-http/3.6.0/status.svg)](https://deps.rs/crate/actix-http/3.6.0)
 [![Download](https://img.shields.io/crates/d/actix-http.svg)](https://crates.io/crates/actix-http)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 
 <!-- prettier-ignore-end -->
 
+## Documentation & Resources
+
+- [API Documentation](https://docs.rs/actix-http)
+- Minimum Supported Rust Version (MSRV): 1.68
+
 ## Examples
 
 ```rust

actix-http/benches/date-formatting.rs

@@ -1,20 +0,0 @@
-use std::time::SystemTime;
-
-use actix_http::header::HttpDate;
-use divan::{black_box, AllocProfiler, Bencher};
-
-#[global_allocator]
-static ALLOC: AllocProfiler = AllocProfiler::system();
-
-#[divan::bench]
-fn date_formatting(b: Bencher<'_, '_>) {
-    let now = SystemTime::now();
-
-    b.bench(|| {
-        black_box(HttpDate::from(black_box(now)).to_string());
-    })
-}
-
-fn main() {
-    divan::main();
-}

actix-http/examples/actix-web.rs

@@ -1,10 +1,10 @@
 use actix_http::HttpService;
 use actix_server::Server;
 use actix_service::map_config;
-use actix_web::{dev::AppConfig, get, App, Responder};
+use actix_web::{dev::AppConfig, get, App};
 
 #[get("/")]
-async fn index() -> impl Responder {
+async fn index() -> &'static str {
     "Hello, world. From Actix Web!"
 }
 

actix-http/examples/echo.rs

@@ -23,7 +23,7 @@ async fn main() -> io::Result<()> {
                         body.extend_from_slice(&item?);
                     }
 
-                    info!("request body: {body:?}");
+                    info!("request body: {:?}", body);
 
                     let res = Response::build(StatusCode::OK)
                         .insert_header(("x-head", HeaderValue::from_static("dummy value!")))
@@ -31,7 +31,8 @@ async fn main() -> io::Result<()> {
 
                     Ok::<_, Error>(res)
                 })
-                .tcp() // No TLS
+                // No TLS
+                .tcp()
         })?
         .run()
         .await

actix-http/examples/h2c-detect.rs

@@ -8,7 +8,7 @@
 
 use std::{convert::Infallible, io};
 
-use actix_http::{body::BodyStream, HttpService, Request, Response, StatusCode};
+use actix_http::{HttpService, Request, Response, StatusCode};
 use actix_server::Server;
 
 #[tokio::main(flavor = "current_thread")]
@@ -19,12 +19,7 @@ async fn main() -> io::Result<()> {
         .bind("h2c-detect", ("127.0.0.1", 8080), || {
             HttpService::build()
                 .finish(|_req: Request| async move {
-                    Ok::<_, Infallible>(Response::build(StatusCode::OK).body(BodyStream::new(
-                        futures_util::stream::iter([
-                            Ok::<_, String>("123".into()),
-                            Err("wertyuikmnbvcxdfty6t".to_owned()),
-                        ]),
-                    )))
+                    Ok::<_, Infallible>(Response::build(StatusCode::OK).body("Hello!"))
                 })
                 .tcp_auto_h2c()
         })?

actix-http/examples/hello-world.rs

@@ -17,7 +17,7 @@ async fn main() -> io::Result<()> {
                     ext.insert(42u32);
                 })
                 .finish(|req: Request| async move {
-                    info!("{req:?}");
+                    info!("{:?}", req);
 
                     let mut res = Response::build(StatusCode::OK);
                     res.insert_header(("x-head", HeaderValue::from_static("dummy value!")));

actix-http/examples/streaming-error.rs

@@ -22,16 +22,16 @@ async fn main() -> io::Result<()> {
         .bind("streaming-error", ("127.0.0.1", 8080), || {
             HttpService::build()
                 .finish(|req| async move {
-                    info!("{req:?}");
+                    info!("{:?}", req);
                     let res = Response::ok();
 
                     Ok::<_, Infallible>(res.set_body(BodyStream::new(stream! {
                         yield Ok(Bytes::from("123"));
                         yield Ok(Bytes::from("456"));
 
-                        actix_rt::time::sleep(Duration::from_secs(1)).await;
+                        actix_rt::time::sleep(Duration::from_millis(1000)).await;
 
-                        yield Err(io::Error::new(io::ErrorKind::Other, "abc"));
+                        yield Err(io::Error::new(io::ErrorKind::Other, ""));
                     })))
                 })
                 .tcp()

actix-http/examples/tls_rustls.rs

@@ -12,7 +12,7 @@
 //! Protocol: HTTP/1.1
 //! ```
 
-extern crate tls_rustls_023 as rustls;
+extern crate tls_rustls_022 as rustls;
 
 use std::io;
 
@@ -36,17 +36,16 @@ async fn main() -> io::Result<()> {
                     );
                     ok::<_, Error>(Response::ok().set_body(body))
                 })
-                .rustls_0_23(rustls_config())
+                .rustls_0_22(rustls_config())
         })?
         .run()
         .await
 }
 
 fn rustls_config() -> rustls::ServerConfig {
-    let rcgen::CertifiedKey { cert, key_pair } =
-        rcgen::generate_simple_self_signed(["localhost".to_owned()]).unwrap();
-    let cert_file = cert.pem();
-    let key_file = key_pair.serialize_pem();
+    let cert = rcgen::generate_simple_self_signed(vec!["localhost".to_owned()]).unwrap();
+    let cert_file = cert.serialize_pem().unwrap();
+    let key_file = cert.serialize_private_key_pem();
 
     let cert_file = &mut io::BufReader::new(cert_file.as_bytes());
     let key_file = &mut io::BufReader::new(key_file.as_bytes());

actix-http/examples/ws.rs

@@ -1,7 +1,7 @@
 //! Sets up a WebSocket server over TCP and TLS.
 //! Sends a heartbeat message every 4 seconds but does not respond to any incoming frames.
 
-extern crate tls_rustls_023 as rustls;
+extern crate tls_rustls_022 as rustls;
 
 use std::{
     io,
@@ -17,6 +17,7 @@ use bytes::{Bytes, BytesMut};
 use bytestring::ByteString;
 use futures_core::{ready, Stream};
 use tokio_util::codec::Encoder;
+use tracing::{info, trace};
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {
@@ -29,19 +30,19 @@ async fn main() -> io::Result<()> {
         .bind("tls", ("127.0.0.1", 8443), || {
             HttpService::build()
                 .finish(handler)
-                .rustls_0_23(tls_config())
+                .rustls_0_22(tls_config())
         })?
         .run()
         .await
 }
 
 async fn handler(req: Request) -> Result<Response<BodyStream<Heartbeat>>, Error> {
-    tracing::info!("handshaking");
+    info!("handshaking");
     let mut res = ws::handshake(req.head())?;
 
     // handshake will always fail under HTTP/2
 
-    tracing::info!("responding");
+    info!("responding");
     res.message_body(BodyStream::new(Heartbeat::new(ws::Codec::new())))
 }
 
@@ -63,7 +64,7 @@ impl Stream for Heartbeat {
     type Item = Result<Bytes, Error>;
 
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        tracing::trace!("poll");
+        trace!("poll");
 
         ready!(self.as_mut().interval.poll_tick(cx));
 
@@ -86,10 +87,9 @@ fn tls_config() -> rustls::ServerConfig {
 
     use rustls_pemfile::{certs, pkcs8_private_keys};
 
-    let rcgen::CertifiedKey { cert, key_pair } =
-        rcgen::generate_simple_self_signed(["localhost".to_owned()]).unwrap();
-    let cert_file = cert.pem();
-    let key_file = key_pair.serialize_pem();
+    let cert = rcgen::generate_simple_self_signed(vec!["localhost".to_owned()]).unwrap();
+    let cert_file = cert.serialize_pem().unwrap();
+    let key_file = cert.serialize_private_key_pem();
 
     let cert_file = &mut BufReader::new(cert_file.as_bytes());
     let key_file = &mut BufReader::new(key_file.as_bytes());

actix-http/src/body/body_stream.rs

@@ -131,7 +131,7 @@ mod tests {
         assert_eq!(to_bytes(body).await.ok(), Some(Bytes::from("12")));
     }
     #[derive(Debug, Display, Error)]
-    #[display("stream error")]
+    #[display(fmt = "stream error")]
     struct StreamErr;
 
     #[actix_rt::test]

actix-http/src/body/message_body.rs

@@ -531,6 +531,7 @@ where
 mod tests {
     use actix_rt::pin;
     use actix_utils::future::poll_fn;
+    use bytes::{Bytes, BytesMut};
     use futures_util::stream;
 
     use super::*;

actix-http/src/body/utils.rs

@@ -38,7 +38,7 @@ pub async fn to_bytes<B: MessageBody>(body: B) -> Result<Bytes, B::Error> {
 
 /// Error type returned from [`to_bytes_limited`] when body produced exceeds limit.
 #[derive(Debug, Display, Error)]
-#[display("limit exceeded while collecting body bytes")]
+#[display(fmt = "limit exceeded while collecting body bytes")]
 #[non_exhaustive]
 pub struct BodyLimitExceeded;
 

actix-http/src/date.rs

@@ -28,7 +28,7 @@ impl Date {
 
     fn update(&mut self) {
         self.pos = 0;
-        write!(self, "{}", httpdate::HttpDate::from(SystemTime::now())).unwrap();
+        write!(self, "{}", httpdate::fmt_http_date(SystemTime::now())).unwrap();
     }
 }
 

actix-http/src/encoding/encoder.rs

@@ -415,11 +415,11 @@ fn new_brotli_compressor() -> Box<brotli::CompressorWriter<Writer>> {
 #[non_exhaustive]
 pub enum EncoderError {
     /// Wrapped body stream error.
-    #[display("body")]
+    #[display(fmt = "body")]
     Body(Box<dyn StdError>),
 
     /// Generic I/O error.
-    #[display("io")]
+    #[display(fmt = "io")]
     Io(io::Error),
 }
 

actix-http/src/error.rs

@@ -3,7 +3,7 @@
 use std::{error::Error as StdError, fmt, io, str::Utf8Error, string::FromUtf8Error};
 
 use derive_more::{Display, Error, From};
-pub use http::{status::InvalidStatusCode, Error as HttpError};
+pub use http::Error as HttpError;
 use http::{uri::InvalidUri, StatusCode};
 
 use crate::{body::BoxBody, Response};
@@ -80,28 +80,28 @@ impl From<Error> for Response<BoxBody> {
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Display)]
 pub(crate) enum Kind {
-    #[display("error processing HTTP")]
+    #[display(fmt = "error processing HTTP")]
     Http,
 
-    #[display("error parsing HTTP message")]
+    #[display(fmt = "error parsing HTTP message")]
     Parse,
 
-    #[display("request payload read error")]
+    #[display(fmt = "request payload read error")]
     Payload,
 
-    #[display("response body write error")]
+    #[display(fmt = "response body write error")]
     Body,
 
-    #[display("send response error")]
+    #[display(fmt = "send response error")]
     SendResponse,
 
-    #[display("error in WebSocket process")]
+    #[display(fmt = "error in WebSocket process")]
     Ws,
 
-    #[display("connection error")]
+    #[display(fmt = "connection error")]
     Io,
 
-    #[display("encoder error")]
+    #[display(fmt = "encoder error")]
     Encoder,
 }
 
@@ -160,44 +160,44 @@ impl From<crate::ws::ProtocolError> for Error {
 #[non_exhaustive]
 pub enum ParseError {
     /// An invalid `Method`, such as `GE.T`.
-    #[display("invalid method specified")]
+    #[display(fmt = "invalid method specified")]
     Method,
 
     /// An invalid `Uri`, such as `exam ple.domain`.
-    #[display("URI error: {}", _0)]
+    #[display(fmt = "URI error: {}", _0)]
     Uri(InvalidUri),
 
     /// An invalid `HttpVersion`, such as `HTP/1.1`
-    #[display("invalid HTTP version specified")]
+    #[display(fmt = "invalid HTTP version specified")]
     Version,
 
     /// An invalid `Header`.
-    #[display("invalid Header provided")]
+    #[display(fmt = "invalid Header provided")]
     Header,
 
     /// A message head is too large to be reasonable.
-    #[display("message head is too large")]
+    #[display(fmt = "message head is too large")]
     TooLarge,
 
     /// A message reached EOF, but is not complete.
-    #[display("message is incomplete")]
+    #[display(fmt = "message is incomplete")]
     Incomplete,
 
     /// An invalid `Status`, such as `1337 ELITE`.
-    #[display("invalid status provided")]
+    #[display(fmt = "invalid status provided")]
     Status,
 
     /// A timeout occurred waiting for an IO event.
     #[allow(dead_code)]
-    #[display("timeout")]
+    #[display(fmt = "timeout")]
     Timeout,
 
     /// An I/O error that occurred while trying to read or write to a network stream.
-    #[display("I/O error: {}", _0)]
+    #[display(fmt = "I/O error: {}", _0)]
     Io(io::Error),
 
     /// Parsing a field as string failed.
-    #[display("UTF-8 error: {}", _0)]
+    #[display(fmt = "UTF-8 error: {}", _0)]
     Utf8(Utf8Error),
 }
 
@@ -256,28 +256,28 @@ impl From<ParseError> for Response<BoxBody> {
 #[non_exhaustive]
 pub enum PayloadError {
     /// A payload reached EOF, but is not complete.
-    #[display("payload reached EOF before completing: {:?}", _0)]
+    #[display(fmt = "payload reached EOF before completing: {:?}", _0)]
     Incomplete(Option<io::Error>),
 
     /// Content encoding stream corruption.
-    #[display("can not decode content-encoding")]
+    #[display(fmt = "can not decode content-encoding")]
     EncodingCorrupted,
 
     /// Payload reached size limit.
-    #[display("payload reached size limit")]
+    #[display(fmt = "payload reached size limit")]
     Overflow,
 
     /// Payload length is unknown.
-    #[display("payload length is unknown")]
+    #[display(fmt = "payload length is unknown")]
     UnknownLength,
 
     /// HTTP/2 payload error.
     #[cfg(feature = "http2")]
-    #[display("{}", _0)]
+    #[display(fmt = "{}", _0)]
     Http2Payload(::h2::Error),
 
     /// Generic I/O error.
-    #[display("{}", _0)]
+    #[display(fmt = "{}", _0)]
     Io(io::Error),
 }
 
@@ -326,44 +326,44 @@ impl From<PayloadError> for Error {
 #[non_exhaustive]
 pub enum DispatchError {
     /// Service error.
-    #[display("service error")]
+    #[display(fmt = "service error")]
     Service(Response<BoxBody>),
 
     /// Body streaming error.
-    #[display("body error: {}", _0)]
+    #[display(fmt = "body error: {}", _0)]
     Body(Box<dyn StdError>),
 
     /// Upgrade service error.
-    #[display("upgrade error")]
+    #[display(fmt = "upgrade error")]
     Upgrade,
 
     /// An `io::Error` that occurred while trying to read or write to a network stream.
-    #[display("I/O error: {}", _0)]
+    #[display(fmt = "I/O error: {}", _0)]
     Io(io::Error),
 
     /// Request parse error.
-    #[display("request parse error: {}", _0)]
+    #[display(fmt = "request parse error: {}", _0)]
     Parse(ParseError),
 
     /// HTTP/2 error.
-    #[display("{}", _0)]
+    #[display(fmt = "{}", _0)]
     #[cfg(feature = "http2")]
     H2(h2::Error),
 
     /// The first request did not complete within the specified timeout.
-    #[display("request did not complete within the specified timeout")]
+    #[display(fmt = "request did not complete within the specified timeout")]
     SlowRequestTimeout,
 
     /// Disconnect timeout. Makes sense for TLS streams.
-    #[display("connection shutdown timeout")]
+    #[display(fmt = "connection shutdown timeout")]
     DisconnectTimeout,
 
     /// Handler dropped payload before reading EOF.
-    #[display("handler dropped payload before reading EOF")]
+    #[display(fmt = "handler dropped payload before reading EOF")]
     HandlerDroppedPayload,
 
     /// Internal error.
-    #[display("internal error")]
+    #[display(fmt = "internal error")]
     InternalError,
 }
 
@@ -389,17 +389,19 @@ impl StdError for DispatchError {
 #[non_exhaustive]
 pub enum ContentTypeError {
     /// Can not parse content type.
-    #[display("could not parse content type")]
+    #[display(fmt = "could not parse content type")]
     ParseError,
 
     /// Unknown content encoding.
-    #[display("unknown content encoding")]
+    #[display(fmt = "unknown content encoding")]
     UnknownEncoding,
 }
 
 #[cfg(test)]
 mod tests {
-    use http::Error as HttpError;
+    use std::io;
+
+    use http::{Error as HttpError, StatusCode};
 
     use super::*;
 

actix-http/src/extensions.rs

@@ -31,7 +31,7 @@ impl Hasher for NoOpHasher {
 /// All entries into this map must be owned types (or static references).
 #[derive(Default)]
 pub struct Extensions {
-    // use no-op hasher with a std HashMap with for faster lookups on the small `TypeId` keys
+    /// Use AHasher with a std HashMap with for faster lookups on the small `TypeId` keys.
     map: HashMap<TypeId, Box<dyn Any>, BuildHasherDefault<NoOpHasher>>,
 }
 
@@ -104,46 +104,6 @@ impl Extensions {
             .and_then(|boxed| boxed.downcast_mut())
     }
 
-    /// Inserts the given `value` into the extensions if it is not present, then returns a reference
-    /// to the value in the extensions.
-    ///
-    /// ```
-    /// # use actix_http::Extensions;
-    /// let mut map = Extensions::new();
-    /// assert_eq!(map.get::<Vec<u32>>(), None);
-    ///
-    /// map.get_or_insert(Vec::<u32>::new()).push(1);
-    /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1]));
-    ///
-    /// map.get_or_insert(Vec::<u32>::new()).push(2);
-    /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1,2]));
-    /// ```
-    pub fn get_or_insert<T: 'static>(&mut self, value: T) -> &mut T {
-        self.get_or_insert_with(|| value)
-    }
-
-    /// Inserts a value computed from `f` into the extensions if the given `value` is not present,
-    /// then returns a reference to the value in the extensions.
-    ///
-    /// ```
-    /// # use actix_http::Extensions;
-    /// let mut map = Extensions::new();
-    /// assert_eq!(map.get::<Vec<u32>>(), None);
-    ///
-    /// map.get_or_insert_with(Vec::<u32>::new).push(1);
-    /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1]));
-    ///
-    /// map.get_or_insert_with(Vec::<u32>::new).push(2);
-    /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1,2]));
-    /// ```
-    pub fn get_or_insert_with<T: 'static, F: FnOnce() -> T>(&mut self, default: F) -> &mut T {
-        self.map
-            .entry(TypeId::of::<T>())
-            .or_insert_with(|| Box::new(default()))
-            .downcast_mut()
-            .expect("extensions map should now contain a T value")
-    }
-
     /// Remove an item from the map of a given type.
     ///
     /// If an item of this type was already stored, it will be returned.

actix-http/src/h1/codec.rs

@@ -198,6 +198,9 @@ impl Encoder<Message<(Response<()>, BodySize)>> for Codec {
 
 #[cfg(test)]
 mod tests {
+    use bytes::BytesMut;
+    use http::Method;
+
     use super::*;
     use crate::HttpMessage as _;
 

actix-http/src/h1/decoder.rs

@@ -563,8 +563,15 @@ impl Decoder for PayloadDecoder {
 
 #[cfg(test)]
 mod tests {
+    use bytes::{Bytes, BytesMut};
+    use http::{Method, Version};
+
     use super::*;
-    use crate::{header::SET_COOKIE, HttpMessage as _};
+    use crate::{
+        error::ParseError,
+        header::{HeaderName, SET_COOKIE},
+        HttpMessage as _,
+    };
 
     impl PayloadType {
         pub(crate) fn unwrap(self) -> PayloadDecoder {

actix-http/src/h1/dispatcher.rs

@@ -512,10 +512,8 @@ where
                             }
 
                             Poll::Ready(Some(Err(err))) => {
-                                let err = err.into();
-                                tracing::error!("Response payload stream error: {err:?}");
                                 this.flags.insert(Flags::FINISHED);
-                                return Err(DispatchError::Body(err));
+                                return Err(DispatchError::Body(err.into()));
                             }
 
                             Poll::Pending => return Ok(PollResponse::DoNothing),
@@ -551,7 +549,6 @@ where
                             }
 
                             Poll::Ready(Some(Err(err))) => {
-                                tracing::error!("Response payload stream error: {err:?}");
                                 this.flags.insert(Flags::FINISHED);
                                 return Err(DispatchError::Body(
                                     Error::new_body().with_cause(err).into(),
@@ -706,7 +703,7 @@ where
 
                             req.head_mut().peer_addr = *this.peer_addr;
 
-                            req.conn_data.clone_from(this.conn_data);
+                            req.conn_data = this.conn_data.as_ref().map(Rc::clone);
 
                             match this.codec.message_type() {
                                 // request has no payload

actix-http/src/h1/encoder.rs

@@ -313,7 +313,7 @@ impl MessageType for RequestHeadType {
                 _ => return Err(io::Error::new(io::ErrorKind::Other, "unsupported version")),
             }
         )
-        .map_err(|err| io::Error::new(io::ErrorKind::Other, err))
+        .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
     }
 }
 
@@ -433,7 +433,7 @@ impl TransferEncoding {
                     buf.extend_from_slice(b"0\r\n\r\n");
                 } else {
                     writeln!(helpers::MutWriter(buf), "{:X}\r", msg.len())
-                        .map_err(|err| io::Error::new(io::ErrorKind::Other, err))?;
+                        .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
 
                     buf.reserve(msg.len() + 2);
                     buf.extend_from_slice(msg);

actix-http/src/h1/service.rs

@@ -335,67 +335,6 @@ mod rustls_0_22 {
     }
 }
 
-#[cfg(feature = "rustls-0_23")]
-mod rustls_0_23 {
-    use std::io;
-
-    use actix_service::ServiceFactoryExt as _;
-    use actix_tls::accept::{
-        rustls_0_23::{reexports::ServerConfig, Acceptor, TlsStream},
-        TlsError,
-    };
-
-    use super::*;
-
-    impl<S, B, X, U> H1Service<TlsStream<TcpStream>, S, B, X, U>
-    where
-        S: ServiceFactory<Request, Config = ()>,
-        S::Future: 'static,
-        S::Error: Into<Response<BoxBody>>,
-        S::InitError: fmt::Debug,
-        S::Response: Into<Response<B>>,
-
-        B: MessageBody,
-
-        X: ServiceFactory<Request, Config = (), Response = Request>,
-        X::Future: 'static,
-        X::Error: Into<Response<BoxBody>>,
-        X::InitError: fmt::Debug,
-
-        U: ServiceFactory<
-            (Request, Framed<TlsStream<TcpStream>, Codec>),
-            Config = (),
-            Response = (),
-        >,
-        U::Future: 'static,
-        U::Error: fmt::Display + Into<Response<BoxBody>>,
-        U::InitError: fmt::Debug,
-    {
-        /// Create Rustls v0.23 based service.
-        pub fn rustls_0_23(
-            self,
-            config: ServerConfig,
-        ) -> impl ServiceFactory<
-            TcpStream,
-            Config = (),
-            Response = (),
-            Error = TlsError<io::Error, DispatchError>,
-            InitError = (),
-        > {
-            Acceptor::new(config)
-                .map_init_err(|_| {
-                    unreachable!("TLS acceptor service factory does not error on init")
-                })
-                .map_err(TlsError::into_service_error)
-                .map(|io: TlsStream<TcpStream>| {
-                    let peer_addr = io.get_ref().0.peer_addr().ok();
-                    (io, peer_addr)
-                })
-                .and_then(self.map_err(TlsError::Service))
-        }
-    }
-}
-
 impl<T, S, B, X, U> H1Service<T, S, B, X, U>
 where
     S: ServiceFactory<Request, Config = ()>,
@@ -480,15 +419,15 @@ where
         let cfg = self.cfg.clone();
 
         Box::pin(async move {
-            let expect = expect.await.map_err(|err| {
-                tracing::error!("Initialization of HTTP expect service error: {err:?}");
-            })?;
+            let expect = expect
+                .await
+                .map_err(|e| error!("Init http expect service error: {:?}", e))?;
 
             let upgrade = match upgrade {
                 Some(upgrade) => {
-                    let upgrade = upgrade.await.map_err(|err| {
-                        tracing::error!("Initialization of HTTP upgrade service error: {err:?}");
-                    })?;
+                    let upgrade = upgrade
+                        .await
+                        .map_err(|e| error!("Init http upgrade service error: {:?}", e))?;
                     Some(upgrade)
                 }
                 None => None,
@@ -496,7 +435,7 @@ where
 
             let service = service
                 .await
-                .map_err(|err| error!("Initialization of HTTP service error: {err:?}"))?;
+                .map_err(|e| error!("Init http service error: {:?}", e))?;
 
             Ok(H1ServiceHandler::new(
                 cfg,
@@ -541,6 +480,6 @@ where
 
     fn call(&self, (io, addr): (T, Option<net::SocketAddr>)) -> Self::Future {
         let conn_data = OnConnectData::from_io(&io, self.on_connect_ext.as_deref());
-        Dispatcher::new(io, Rc::clone(&self.flow), self.cfg.clone(), addr, conn_data)
+        Dispatcher::new(io, self.flow.clone(), self.cfg.clone(), addr, conn_data)
     }
 }

actix-http/src/h2/dispatcher.rs

@@ -4,7 +4,7 @@ use std::{
     future::Future,
     marker::PhantomData,
     net,
-    pin::{pin, Pin},
+    pin::Pin,
     rc::Rc,
     task::{Context, Poll},
 };
@@ -20,6 +20,7 @@ use h2::{
     Ping, PingPong,
 };
 use pin_project_lite::pin_project;
+use tracing::{error, trace, warn};
 
 use crate::{
     body::{BodySize, BoxBody, MessageBody},
@@ -126,7 +127,7 @@ where
                     head.headers = parts.headers.into();
                     head.peer_addr = this.peer_addr;
 
-                    req.conn_data.clone_from(&this.conn_data);
+                    req.conn_data = this.conn_data.as_ref().map(Rc::clone);
 
                     let fut = this.flow.service.call(req);
                     let config = this.config.clone();
@@ -146,13 +147,11 @@ where
                         if let Err(err) = res {
                             match err {
                                 DispatchError::SendResponse(err) => {
-                                    tracing::trace!("Error sending response: {err:?}");
-                                }
-                                DispatchError::SendData(err) => {
-                                    tracing::warn!("Send data error: {err:?}");
+                                    trace!("Error sending HTTP/2 response: {:?}", err)
                                 }
+                                DispatchError::SendData(err) => warn!("{:?}", err),
                                 DispatchError::ResponseBody(err) => {
-                                    tracing::error!("Response payload stream error: {err:?}");
+                                    error!("Response payload stream error: {:?}", err)
                                 }
                             }
                         }
@@ -229,9 +228,9 @@ where
         return Ok(());
     }
 
-    let mut body = pin!(body);
-
     // poll response body and send chunks to client
+    actix_rt::pin!(body);
+
     while let Some(res) = poll_fn(|cx| body.as_mut().poll_next(cx)).await {
         let mut chunk = res.map_err(|err| DispatchError::ResponseBody(err.into()))?;
 

actix-http/src/h2/service.rs

@@ -293,57 +293,6 @@ mod rustls_0_22 {
     }
 }
 
-#[cfg(feature = "rustls-0_23")]
-mod rustls_0_23 {
-    use std::io;
-
-    use actix_service::ServiceFactoryExt as _;
-    use actix_tls::accept::{
-        rustls_0_23::{reexports::ServerConfig, Acceptor, TlsStream},
-        TlsError,
-    };
-
-    use super::*;
-
-    impl<S, B> H2Service<TlsStream<TcpStream>, S, B>
-    where
-        S: ServiceFactory<Request, Config = ()>,
-        S::Future: 'static,
-        S::Error: Into<Response<BoxBody>> + 'static,
-        S::Response: Into<Response<B>> + 'static,
-        <S::Service as Service<Request>>::Future: 'static,
-
-        B: MessageBody + 'static,
-    {
-        /// Create Rustls v0.23 based service.
-        pub fn rustls_0_23(
-            self,
-            mut config: ServerConfig,
-        ) -> impl ServiceFactory<
-            TcpStream,
-            Config = (),
-            Response = (),
-            Error = TlsError<io::Error, DispatchError>,
-            InitError = S::InitError,
-        > {
-            let mut protos = vec![b"h2".to_vec()];
-            protos.extend_from_slice(&config.alpn_protocols);
-            config.alpn_protocols = protos;
-
-            Acceptor::new(config)
-                .map_init_err(|_| {
-                    unreachable!("TLS acceptor service factory does not error on init")
-                })
-                .map_err(TlsError::into_service_error)
-                .map(|io: TlsStream<TcpStream>| {
-                    let peer_addr = io.get_ref().0.peer_addr().ok();
-                    (io, peer_addr)
-                })
-                .and_then(self.map_err(TlsError::Service))
-        }
-    }
-}
-
 impl<T, S, B> ServiceFactory<(T, Option<net::SocketAddr>)> for H2Service<T, S, B>
 where
     T: AsyncRead + AsyncWrite + Unpin + 'static,
@@ -434,7 +383,7 @@ where
 
         H2ServiceHandlerResponse {
             state: State::Handshake(
-                Some(Rc::clone(&self.flow)),
+                Some(self.flow.clone()),
                 Some(self.cfg.clone()),
                 addr,
                 on_connect_data,

actix-http/src/header/common.rs

@@ -18,14 +18,6 @@ pub const CACHE_STATUS: HeaderName = HeaderName::from_static("cache-status");
 // TODO(breaking): replace with http's version
 pub const CDN_CACHE_CONTROL: HeaderName = HeaderName::from_static("cdn-cache-control");
 
-/// Response header field that sends a signal to the user agent that it ought to remove all data of
-/// a certain set of types.
-///
-/// See the [W3C Clear-Site-Data spec] for full semantics.
-///
-/// [W3C Clear-Site-Data spec]: https://www.w3.org/TR/clear-site-data/#header
-pub const CLEAR_SITE_DATA: HeaderName = HeaderName::from_static("clear-site-data");
-
 /// Response header that prevents a document from loading any cross-origin resources that don't
 /// explicitly grant the document permission (using [CORP] or [CORS]).
 ///

actix-http/src/header/map.rs

@@ -2,7 +2,7 @@
 
 use std::{borrow::Cow, collections::hash_map, iter, ops};
 
-use foldhash::{HashMap as FoldHashMap, HashMapExt as _};
+use ahash::AHashMap;
 use http::header::{HeaderName, HeaderValue};
 use smallvec::{smallvec, SmallVec};
 
@@ -13,9 +13,8 @@ use super::AsHeaderName;
 /// `HeaderMap` is a "multi-map" of [`HeaderName`] to one or more [`HeaderValue`]s.
 ///
 /// # Examples
-///
 /// ```
-/// # use actix_http::header::{self, HeaderMap, HeaderValue};
+/// use actix_http::header::{self, HeaderMap, HeaderValue};
 ///
 /// let mut map = HeaderMap::new();
 ///
@@ -30,24 +29,9 @@ use super::AsHeaderName;
 ///
 /// assert!(!map.contains_key(header::ORIGIN));
 /// ```
-///
-/// Construct a header map using the [`FromIterator`] implementation. Note that it uses the append
-/// strategy, so duplicate header names are preserved.
-///
-/// ```
-/// use actix_http::header::{self, HeaderMap, HeaderValue};
-///
-/// let headers = HeaderMap::from_iter([
-///     (header::CONTENT_TYPE, HeaderValue::from_static("text/plain")),
-///     (header::COOKIE, HeaderValue::from_static("foo=1")),
-///     (header::COOKIE, HeaderValue::from_static("bar=1")),
-/// ]);
-///
-/// assert_eq!(headers.len(), 3);
-/// ```
 #[derive(Debug, Clone, Default)]
 pub struct HeaderMap {
-    pub(crate) inner: FoldHashMap<HeaderName, Value>,
+    pub(crate) inner: AHashMap<HeaderName, Value>,
 }
 
 /// A bespoke non-empty list for HeaderMap values.
@@ -116,7 +100,7 @@ impl HeaderMap {
     /// ```
     pub fn with_capacity(capacity: usize) -> Self {
         HeaderMap {
-            inner: FoldHashMap::with_capacity(capacity),
+            inner: AHashMap::with_capacity(capacity),
         }
     }
 
@@ -384,8 +368,8 @@ impl HeaderMap {
     /// let removed = map.insert(header::ACCEPT, HeaderValue::from_static("text/html"));
     /// assert!(!removed.is_empty());
     /// ```
-    pub fn insert(&mut self, name: HeaderName, val: HeaderValue) -> Removed {
-        let value = self.inner.insert(name, Value::one(val));
+    pub fn insert(&mut self, key: HeaderName, val: HeaderValue) -> Removed {
+        let value = self.inner.insert(key, Value::one(val));
         Removed::new(value)
     }
 
@@ -652,16 +636,6 @@ impl<'a> IntoIterator for &'a HeaderMap {
     }
 }
 
-impl FromIterator<(HeaderName, HeaderValue)> for HeaderMap {
-    fn from_iter<T: IntoIterator<Item = (HeaderName, HeaderValue)>>(iter: T) -> Self {
-        iter.into_iter()
-            .fold(Self::new(), |mut map, (name, value)| {
-                map.append(name, value);
-                map
-            })
-    }
-}
-
 /// Convert a `http::HeaderMap` to our `HeaderMap`.
 impl From<http::HeaderMap> for HeaderMap {
     fn from(mut map: http::HeaderMap) -> Self {
@@ -830,7 +804,7 @@ impl<'a> Drain<'a> {
     }
 }
 
-impl Iterator for Drain<'_> {
+impl<'a> Iterator for Drain<'a> {
     type Item = (Option<HeaderName>, HeaderValue);
 
     fn next(&mut self) -> Option<Self::Item> {

actix-http/src/header/mod.rs

@@ -42,9 +42,9 @@ pub use self::{
     as_name::AsHeaderName,
     // re-export list is explicit so that any updates to `http` do not conflict with this set
     common::{
-        CACHE_STATUS, CDN_CACHE_CONTROL, CLEAR_SITE_DATA, CROSS_ORIGIN_EMBEDDER_POLICY,
-        CROSS_ORIGIN_OPENER_POLICY, CROSS_ORIGIN_RESOURCE_POLICY, PERMISSIONS_POLICY,
-        X_FORWARDED_FOR, X_FORWARDED_HOST, X_FORWARDED_PROTO,
+        CACHE_STATUS, CDN_CACHE_CONTROL, CROSS_ORIGIN_EMBEDDER_POLICY, CROSS_ORIGIN_OPENER_POLICY,
+        CROSS_ORIGIN_RESOURCE_POLICY, PERMISSIONS_POLICY, X_FORWARDED_FOR, X_FORWARDED_HOST,
+        X_FORWARDED_PROTO,
     },
     into_pair::TryIntoHeaderPair,
     into_value::TryIntoHeaderValue,

actix-http/src/header/shared/content_encoding.rs

@@ -11,7 +11,7 @@ use crate::{
 
 /// Error returned when a content encoding is unknown.
 #[derive(Debug, Display, Error)]
-#[display("unsupported content encoding")]
+#[display(fmt = "unsupported content encoding")]
 pub struct ContentEncodingParseError;
 
 /// Represents a supported content encoding.

actix-http/src/header/shared/http_date.rs

@@ -24,7 +24,8 @@ impl FromStr for HttpDate {
 
 impl fmt::Display for HttpDate {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        httpdate::HttpDate::from(self.0).fmt(f)
+        let date_str = httpdate::fmt_http_date(self.0);
+        f.write_str(&date_str)
     }
 }
 
@@ -36,7 +37,7 @@ impl TryIntoHeaderValue for HttpDate {
         let mut wrt = MutWriter(&mut buf);
 
         // unwrap: date output is known to be well formed and of known length
-        write!(wrt, "{}", self).unwrap();
+        write!(wrt, "{}", httpdate::fmt_http_date(self.0)).unwrap();
 
         HeaderValue::from_maybe_shared(buf.split().freeze())
     }

actix-http/src/header/shared/quality.rs

@@ -125,7 +125,7 @@ pub fn itoa_fmt<W: fmt::Write, V: itoa::Integer>(mut wr: W, value: V) -> fmt::Re
 }
 
 #[derive(Debug, Clone, Display, Error)]
-#[display("quality out of bounds")]
+#[display(fmt = "quality out of bounds")]
 #[non_exhaustive]
 pub struct QualityOutOfBounds;
 

actix-http/src/header/utils.rs

@@ -80,18 +80,18 @@ mod tests {
 
     #[test]
     fn comma_delimited_parsing() {
-        let headers = [];
+        let headers = vec![];
         let res: Vec<usize> = from_comma_delimited(headers.iter()).unwrap();
         assert_eq!(res, vec![0; 0]);
 
-        let headers = [
+        let headers = vec![
             HeaderValue::from_static("1, 2"),
             HeaderValue::from_static("3,4"),
         ];
         let res: Vec<usize> = from_comma_delimited(headers.iter()).unwrap();
         assert_eq!(res, vec![1, 2, 3, 4]);
 
-        let headers = [
+        let headers = vec![
             HeaderValue::from_static(""),
             HeaderValue::from_static(","),
             HeaderValue::from_static("  "),

actix-http/src/helpers.rs

@@ -61,7 +61,7 @@ pub fn write_content_length<B: BufMut>(n: u64, buf: &mut B, camel_case: bool) {
 /// perform a remaining length check before writing.
 pub(crate) struct MutWriter<'a, B>(pub(crate) &'a mut B);
 
-impl<B> io::Write for MutWriter<'_, B>
+impl<'a, B> io::Write for MutWriter<'a, B>
 where
     B: BufMut,
 {

actix-http/src/http_message.rs

@@ -103,7 +103,7 @@ pub trait HttpMessage: Sized {
     }
 }
 
-impl<T> HttpMessage for &mut T
+impl<'a, T> HttpMessage for &'a mut T
 where
     T: HttpMessage,
 {

actix-http/src/lib.rs

@@ -6,10 +6,7 @@
 //! | ------------------- | ------------------------------------------- |
 //! | `http2`             | HTTP/2 support via [h2].                    |
 //! | `openssl`           | TLS support via [OpenSSL].                  |
-//! | `rustls-0_20`       | TLS support via rustls 0.20.                |
-//! | `rustls-0_21`       | TLS support via rustls 0.21.                |
-//! | `rustls-0_22`       | TLS support via rustls 0.22.                |
-//! | `rustls-0_23`       | TLS support via [rustls] 0.23.              |
+//! | `rustls`            | TLS support via [rustls].                   |
 //! | `compress-brotli`   | Payload compression support: Brotli.        |
 //! | `compress-gzip`     | Payload compression support: Deflate, Gzip. |
 //! | `compress-zstd`     | Payload compression support: Zstd.          |
@@ -20,6 +17,8 @@
 //! [rustls]: https://crates.io/crates/rustls
 //! [trust-dns]: https://crates.io/crates/trust-dns
 
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible)]
 #![allow(
     clippy::type_complexity,
     clippy::too_many_arguments,
@@ -29,7 +28,7 @@
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 
-pub use http::{uri, uri::Uri, Method, StatusCode, Version};
+pub use ::http::{uri, uri::Uri, Method, StatusCode, Version};
 
 pub mod body;
 mod builder;
@@ -59,7 +58,12 @@ pub mod ws;
 
 #[allow(deprecated)]
 pub use self::payload::PayloadStream;
-#[cfg(feature = "__tls")]
+#[cfg(any(
+    feature = "openssl",
+    feature = "rustls-0_20",
+    feature = "rustls-0_21",
+    feature = "rustls-0_22",
+))]
 pub use self::service::TlsAcceptorConfig;
 pub use self::{
     builder::HttpServiceBuilder,

actix-http/src/message.rs

@@ -66,7 +66,7 @@ impl<T: Head> ops::DerefMut for Message<T> {
 
 impl<T: Head> Drop for Message<T> {
     fn drop(&mut self) {
-        T::with_pool(|p| p.release(Rc::clone(&self.head)))
+        T::with_pool(|p| p.release(self.head.clone()))
     }
 }
 

actix-http/src/notify_on_drop.rs

@@ -5,7 +5,7 @@
 use std::cell::RefCell;
 
 thread_local! {
-    static NOTIFY_DROPPED: RefCell<Option<bool>> = const { RefCell::new(None) };
+    static NOTIFY_DROPPED: RefCell<Option<bool>> = RefCell::new(None);
 }
 
 /// Check if the spawned task is dropped.

actix-http/src/payload.rs

@@ -41,31 +41,13 @@ pin_project! {
 }
 
 impl<S> From<crate::h1::Payload> for Payload<S> {
-    #[inline]
     fn from(payload: crate::h1::Payload) -> Self {
         Payload::H1 { payload }
     }
 }
 
-impl<S> From<Bytes> for Payload<S> {
-    #[inline]
-    fn from(bytes: Bytes) -> Self {
-        let (_, mut pl) = crate::h1::Payload::create(true);
-        pl.unread_data(bytes);
-        self::Payload::from(pl)
-    }
-}
-
-impl<S> From<Vec<u8>> for Payload<S> {
-    #[inline]
-    fn from(vec: Vec<u8>) -> Self {
-        Payload::from(Bytes::from(vec))
-    }
-}
-
 #[cfg(feature = "http2")]
 impl<S> From<crate::h2::Payload> for Payload<S> {
-    #[inline]
     fn from(payload: crate::h2::Payload) -> Self {
         Payload::H2 { payload }
     }
@@ -73,7 +55,6 @@ impl<S> From<crate::h2::Payload> for Payload<S> {
 
 #[cfg(feature = "http2")]
 impl<S> From<::h2::RecvStream> for Payload<S> {
-    #[inline]
     fn from(stream: ::h2::RecvStream) -> Self {
         Payload::H2 {
             payload: crate::h2::Payload::new(stream),
@@ -82,15 +63,13 @@ impl<S> From<::h2::RecvStream> for Payload<S> {
 }
 
 impl From<BoxedPayloadStream> for Payload {
-    #[inline]
     fn from(payload: BoxedPayloadStream) -> Self {
         Payload::Stream { payload }
     }
 }
 
 impl<S> Payload<S> {
-    /// Takes current payload and replaces it with `None` value.
-    #[must_use]
+    /// Takes current payload and replaces it with `None` value
     pub fn take(&mut self) -> Payload<S> {
         mem::replace(self, Payload::None)
     }

actix-http/src/responses/builder.rs

@@ -351,9 +351,12 @@ mod tests {
         assert_eq!(resp.headers().get(CONTENT_TYPE).unwrap(), "text/plain");
 
         let resp = Response::build(StatusCode::OK)
-            .content_type(mime::TEXT_JAVASCRIPT)
+            .content_type(mime::APPLICATION_JAVASCRIPT_UTF_8)
             .body(Bytes::new());
-        assert_eq!(resp.headers().get(CONTENT_TYPE).unwrap(), "text/javascript");
+        assert_eq!(
+            resp.headers().get(CONTENT_TYPE).unwrap(),
+            "application/javascript; charset=utf-8"
+        );
     }
 
     #[test]

actix-http/src/service.rs

@@ -241,13 +241,23 @@ where
 }
 
 /// Configuration options used when accepting TLS connection.
-#[cfg(feature = "__tls")]
+#[cfg(any(
+    feature = "openssl",
+    feature = "rustls-0_20",
+    feature = "rustls-0_21",
+    feature = "rustls-0_22",
+))]
 #[derive(Debug, Default)]
 pub struct TlsAcceptorConfig {
     pub(crate) handshake_timeout: Option<std::time::Duration>,
 }
 
-#[cfg(feature = "__tls")]
+#[cfg(any(
+    feature = "openssl",
+    feature = "rustls-0_20",
+    feature = "rustls-0_21",
+    feature = "rustls-0_22",
+))]
 impl TlsAcceptorConfig {
     /// Set TLS handshake timeout duration.
     pub fn handshake_timeout(self, dur: std::time::Duration) -> Self {
@@ -640,102 +650,6 @@ mod rustls_0_22 {
     }
 }
 
-#[cfg(feature = "rustls-0_23")]
-mod rustls_0_23 {
-    use std::io;
-
-    use actix_service::ServiceFactoryExt as _;
-    use actix_tls::accept::{
-        rustls_0_23::{reexports::ServerConfig, Acceptor, TlsStream},
-        TlsError,
-    };
-
-    use super::*;
-
-    impl<S, B, X, U> HttpService<TlsStream<TcpStream>, S, B, X, U>
-    where
-        S: ServiceFactory<Request, Config = ()>,
-        S::Future: 'static,
-        S::Error: Into<Response<BoxBody>> + 'static,
-        S::InitError: fmt::Debug,
-        S::Response: Into<Response<B>> + 'static,
-        <S::Service as Service<Request>>::Future: 'static,
-
-        B: MessageBody + 'static,
-
-        X: ServiceFactory<Request, Config = (), Response = Request>,
-        X::Future: 'static,
-        X::Error: Into<Response<BoxBody>>,
-        X::InitError: fmt::Debug,
-
-        U: ServiceFactory<
-            (Request, Framed<TlsStream<TcpStream>, h1::Codec>),
-            Config = (),
-            Response = (),
-        >,
-        U::Future: 'static,
-        U::Error: fmt::Display + Into<Response<BoxBody>>,
-        U::InitError: fmt::Debug,
-    {
-        /// Create Rustls v0.23 based service.
-        pub fn rustls_0_23(
-            self,
-            config: ServerConfig,
-        ) -> impl ServiceFactory<
-            TcpStream,
-            Config = (),
-            Response = (),
-            Error = TlsError<io::Error, DispatchError>,
-            InitError = (),
-        > {
-            self.rustls_0_23_with_config(config, TlsAcceptorConfig::default())
-        }
-
-        /// Create Rustls v0.23 based service with custom TLS acceptor configuration.
-        pub fn rustls_0_23_with_config(
-            self,
-            mut config: ServerConfig,
-            tls_acceptor_config: TlsAcceptorConfig,
-        ) -> impl ServiceFactory<
-            TcpStream,
-            Config = (),
-            Response = (),
-            Error = TlsError<io::Error, DispatchError>,
-            InitError = (),
-        > {
-            let mut protos = vec![b"h2".to_vec(), b"http/1.1".to_vec()];
-            protos.extend_from_slice(&config.alpn_protocols);
-            config.alpn_protocols = protos;
-
-            let mut acceptor = Acceptor::new(config);
-
-            if let Some(handshake_timeout) = tls_acceptor_config.handshake_timeout {
-                acceptor.set_handshake_timeout(handshake_timeout);
-            }
-
-            acceptor
-                .map_init_err(|_| {
-                    unreachable!("TLS acceptor service factory does not error on init")
-                })
-                .map_err(TlsError::into_service_error)
-                .and_then(|io: TlsStream<TcpStream>| async {
-                    let proto = if let Some(protos) = io.get_ref().1.alpn_protocol() {
-                        if protos.windows(2).any(|window| window == b"h2") {
-                            Protocol::Http2
-                        } else {
-                            Protocol::Http1
-                        }
-                    } else {
-                        Protocol::Http1
-                    };
-                    let peer_addr = io.get_ref().0.peer_addr().ok();
-                    Ok((io, proto, peer_addr))
-                })
-                .and_then(self.map_err(TlsError::Service))
-        }
-    }
-}
-
 impl<T, S, B, X, U> ServiceFactory<(T, Protocol, Option<net::SocketAddr>)>
     for HttpService<T, S, B, X, U>
 where
@@ -775,23 +689,23 @@ where
         let cfg = self.cfg.clone();
 
         Box::pin(async move {
-            let expect = expect.await.map_err(|err| {
-                tracing::error!("Initialization of HTTP expect service error: {err:?}");
-            })?;
+            let expect = expect
+                .await
+                .map_err(|e| error!("Init http expect service error: {:?}", e))?;
 
             let upgrade = match upgrade {
                 Some(upgrade) => {
-                    let upgrade = upgrade.await.map_err(|err| {
-                        tracing::error!("Initialization of HTTP upgrade service error: {err:?}");
-                    })?;
+                    let upgrade = upgrade
+                        .await
+                        .map_err(|e| error!("Init http upgrade service error: {:?}", e))?;
                     Some(upgrade)
                 }
                 None => None,
             };
 
-            let service = service.await.map_err(|err| {
-                tracing::error!("Initialization of HTTP service error: {err:?}");
-            })?;
+            let service = service
+                .await
+                .map_err(|e| error!("Init http service error: {:?}", e))?;
 
             Ok(HttpServiceHandler::new(
                 cfg,
@@ -910,7 +824,7 @@ where
                     handshake: Some((
                         crate::h2::handshake_with_timeout(io, &self.cfg),
                         self.cfg.clone(),
-                        Rc::clone(&self.flow),
+                        self.flow.clone(),
                         conn_data,
                         peer_addr,
                     )),
@@ -926,7 +840,7 @@ where
                 state: State::H1 {
                     dispatcher: h1::Dispatcher::new(
                         io,
-                        Rc::clone(&self.flow),
+                        self.flow.clone(),
                         self.cfg.clone(),
                         peer_addr,
                         conn_data,

actix-http/src/test.rs

@@ -159,8 +159,8 @@ impl TestBuffer {
     #[allow(dead_code)]
     pub(crate) fn clone(&self) -> Self {
         Self {
-            read_buf: Rc::clone(&self.read_buf),
-            write_buf: Rc::clone(&self.write_buf),
+            read_buf: self.read_buf.clone(),
+            write_buf: self.write_buf.clone(),
             err: self.err.clone(),
         }
     }

actix-http/src/ws/dispatcher.rs

@@ -114,14 +114,14 @@ mod inner {
     {
         fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
             match *self {
-                DispatcherError::Service(ref err) => {
-                    write!(fmt, "DispatcherError::Service({err:?})")
+                DispatcherError::Service(ref e) => {
+                    write!(fmt, "DispatcherError::Service({:?})", e)
                 }
-                DispatcherError::Encoder(ref err) => {
-                    write!(fmt, "DispatcherError::Encoder({err:?})")
+                DispatcherError::Encoder(ref e) => {
+                    write!(fmt, "DispatcherError::Encoder({:?})", e)
                 }
-                DispatcherError::Decoder(ref err) => {
-                    write!(fmt, "DispatcherError::Decoder({err:?})")
+                DispatcherError::Decoder(ref e) => {
+                    write!(fmt, "DispatcherError::Decoder({:?})", e)
                 }
             }
         }
@@ -136,9 +136,9 @@ mod inner {
     {
         fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
             match *self {
-                DispatcherError::Service(ref err) => write!(fmt, "{err}"),
-                DispatcherError::Encoder(ref err) => write!(fmt, "{err:?}"),
-                DispatcherError::Decoder(ref err) => write!(fmt, "{err:?}"),
+                DispatcherError::Service(ref e) => write!(fmt, "{}", e),
+                DispatcherError::Encoder(ref e) => write!(fmt, "{:?}", e),
+                DispatcherError::Decoder(ref e) => write!(fmt, "{:?}", e),
             }
         }
     }

actix-http/src/ws/frame.rs

@@ -178,14 +178,14 @@ impl Parser {
         };
 
         if payload_len < 126 {
-            dst.reserve(p_len + 2);
+            dst.reserve(p_len + 2 + if mask { 4 } else { 0 });
             dst.put_slice(&[one, two | payload_len as u8]);
         } else if payload_len <= 65_535 {
-            dst.reserve(p_len + 4);
+            dst.reserve(p_len + 4 + if mask { 4 } else { 0 });
             dst.put_slice(&[one, two | 126]);
             dst.put_u16(payload_len as u16);
         } else {
-            dst.reserve(p_len + 10);
+            dst.reserve(p_len + 10 + if mask { 4 } else { 0 });
             dst.put_slice(&[one, two | 127]);
             dst.put_u64(payload_len as u64);
         };

actix-http/src/ws/mod.rs

@@ -27,43 +27,43 @@ pub use self::{
 #[derive(Debug, Display, Error, From)]
 pub enum ProtocolError {
     /// Received an unmasked frame from client.
-    #[display("received an unmasked frame from client")]
+    #[display(fmt = "received an unmasked frame from client")]
     UnmaskedFrame,
 
     /// Received a masked frame from server.
-    #[display("received a masked frame from server")]
+    #[display(fmt = "received a masked frame from server")]
     MaskedFrame,
 
     /// Encountered invalid opcode.
-    #[display("invalid opcode ({})", _0)]
+    #[display(fmt = "invalid opcode ({})", _0)]
     InvalidOpcode(#[error(not(source))] u8),
 
     /// Invalid control frame length
-    #[display("invalid control frame length ({})", _0)]
+    #[display(fmt = "invalid control frame length ({})", _0)]
     InvalidLength(#[error(not(source))] usize),
 
     /// Bad opcode.
-    #[display("bad opcode")]
+    #[display(fmt = "bad opcode")]
     BadOpCode,
 
     /// A payload reached size limit.
-    #[display("payload reached size limit")]
+    #[display(fmt = "payload reached size limit")]
     Overflow,
 
     /// Continuation has not started.
-    #[display("continuation has not started")]
+    #[display(fmt = "continuation has not started")]
     ContinuationNotStarted,
 
     /// Received new continuation but it is already started.
-    #[display("received new continuation but it has already started")]
+    #[display(fmt = "received new continuation but it has already started")]
     ContinuationStarted,
 
     /// Unknown continuation fragment.
-    #[display("unknown continuation fragment: {}", _0)]
+    #[display(fmt = "unknown continuation fragment: {}", _0)]
     ContinuationFragment(#[error(not(source))] OpCode),
 
     /// I/O error.
-    #[display("I/O error: {}", _0)]
+    #[display(fmt = "I/O error: {}", _0)]
     Io(io::Error),
 }
 
@@ -71,27 +71,27 @@ pub enum ProtocolError {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Display, Error)]
 pub enum HandshakeError {
     /// Only get method is allowed.
-    #[display("method not allowed")]
+    #[display(fmt = "method not allowed")]
     GetMethodRequired,
 
     /// Upgrade header if not set to WebSocket.
-    #[display("WebSocket upgrade is expected")]
+    #[display(fmt = "WebSocket upgrade is expected")]
     NoWebsocketUpgrade,
 
     /// Connection header is not set to upgrade.
-    #[display("connection upgrade is expected")]
+    #[display(fmt = "connection upgrade is expected")]
     NoConnectionUpgrade,
 
     /// WebSocket version header is not set.
-    #[display("WebSocket version header is required")]
+    #[display(fmt = "WebSocket version header is required")]
     NoVersionHeader,
 
     /// Unsupported WebSocket version.
-    #[display("unsupported WebSocket version")]
+    #[display(fmt = "unsupported WebSocket version")]
     UnsupportedVersion,
 
     /// WebSocket key is not set or wrong.
-    #[display("unknown WebSocket key")]
+    #[display(fmt = "unknown WebSocket key")]
     BadWebsocketKey,
 }
 
@@ -221,7 +221,7 @@ pub fn handshake_response(req: &RequestHead) -> ResponseBuilder {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{header, test::TestRequest};
+    use crate::{header, test::TestRequest, Method};
 
     #[test]
     fn test_handshake() {

actix-http/src/ws/proto.rs

@@ -1,4 +1,7 @@
-use std::fmt;
+use std::{
+    convert::{From, Into},
+    fmt,
+};
 
 use base64::prelude::*;
 use tracing::error;

actix-http/tests/test_client.rs

@@ -94,7 +94,7 @@ async fn with_query_parameter() {
 }
 
 #[derive(Debug, Display, Error)]
-#[display("expect failed")]
+#[display(fmt = "expect failed")]
 struct ExpectFailed;
 
 impl From<ExpectFailed> for Response<BoxBody> {

actix-http/tests/test_openssl.rs

@@ -42,11 +42,9 @@ where
 }
 
 fn tls_config() -> SslAcceptor {
-    let rcgen::CertifiedKey { cert, key_pair } =
-        rcgen::generate_simple_self_signed(["localhost".to_owned()]).unwrap();
-    let cert_file = cert.pem();
-    let key_file = key_pair.serialize_pem();
-
+    let cert = rcgen::generate_simple_self_signed(vec!["localhost".to_owned()]).unwrap();
+    let cert_file = cert.serialize_pem().unwrap();
+    let key_file = cert.serialize_private_key_pem();
     let cert = X509::from_pem(cert_file.as_bytes()).unwrap();
     let key = PKey::private_key_from_pem(key_file.as_bytes()).unwrap();
 
@@ -398,7 +396,7 @@ async fn h2_response_http_error_handling() {
 }
 
 #[derive(Debug, Display, Error)]
-#[display("error")]
+#[display(fmt = "error")]
 struct BadRequest;
 
 impl From<BadRequest> for Response<BoxBody> {

actix-http/tests/test_rustls.rs

@@ -1,6 +1,6 @@
-#![cfg(feature = "rustls-0_23")]
+#![cfg(feature = "rustls-0_22")]
 
-extern crate tls_rustls_023 as rustls;
+extern crate tls_rustls_022 as rustls;
 
 use std::{
     convert::Infallible,
@@ -20,7 +20,7 @@ use actix_http::{
 use actix_http_test::test_server;
 use actix_rt::pin;
 use actix_service::{fn_factory_with_config, fn_service};
-use actix_tls::connect::rustls_0_23::webpki_roots_cert_store;
+use actix_tls::connect::rustls_0_22::webpki_roots_cert_store;
 use actix_utils::future::{err, ok, poll_fn};
 use bytes::{Bytes, BytesMut};
 use derive_more::{Display, Error};
@@ -52,10 +52,9 @@ where
 }
 
 fn tls_config() -> RustlsServerConfig {
-    let rcgen::CertifiedKey { cert, key_pair } =
-        rcgen::generate_simple_self_signed(["localhost".to_owned()]).unwrap();
-    let cert_file = cert.pem();
-    let key_file = key_pair.serialize_pem();
+    let cert = rcgen::generate_simple_self_signed(vec!["localhost".to_owned()]).unwrap();
+    let cert_file = cert.serialize_pem().unwrap();
+    let key_file = cert.serialize_private_key_pem();
 
     let cert_file = &mut BufReader::new(cert_file.as_bytes());
     let key_file = &mut BufReader::new(key_file.as_bytes());
@@ -109,7 +108,7 @@ async fn h1() -> io::Result<()> {
     let srv = test_server(move || {
         HttpService::build()
             .h1(|_| ok::<_, Error>(Response::ok()))
-            .rustls_0_23(tls_config())
+            .rustls_0_22(tls_config())
     })
     .await;
 
@@ -123,7 +122,7 @@ async fn h2() -> io::Result<()> {
     let srv = test_server(move || {
         HttpService::build()
             .h2(|_| ok::<_, Error>(Response::ok()))
-            .rustls_0_23(tls_config())
+            .rustls_0_22(tls_config())
     })
     .await;
 
@@ -141,7 +140,7 @@ async fn h1_1() -> io::Result<()> {
                 assert_eq!(req.version(), Version::HTTP_11);
                 ok::<_, Error>(Response::ok())
             })
-            .rustls_0_23(tls_config())
+            .rustls_0_22(tls_config())
     })
     .await;
 
@@ -159,7 +158,7 @@ async fn h2_1() -> io::Result<()> {
                 assert_eq!(req.version(), Version::HTTP_2);
                 ok::<_, Error>(Response::ok())
             })
-            .rustls_0_23_with_config(
+            .rustls_0_22_with_config(
                 tls_config(),
                 TlsAcceptorConfig::default().handshake_timeout(Duration::from_secs(5)),
             )
@@ -180,7 +179,7 @@ async fn h2_body1() -> io::Result<()> {
                 let body = load_body(req.take_payload()).await?;
                 Ok::<_, Error>(Response::ok().set_body(body))
             })
-            .rustls_0_23(tls_config())
+            .rustls_0_22(tls_config())
     })
     .await;
 
@@ -206,7 +205,7 @@ async fn h2_content_length() {
                 ];
                 ok::<_, Infallible>(Response::new(statuses[indx]))
             })
-            .rustls_0_23(tls_config())
+            .rustls_0_22(tls_config())
     })
     .await;
 
@@ -278,7 +277,7 @@ async fn h2_headers() {
                 }
                 ok::<_, Infallible>(config.body(data.clone()))
             })
-            .rustls_0_23(tls_config())
+            .rustls_0_22(tls_config())
     })
     .await;
 
@@ -317,7 +316,7 @@ async fn h2_body2() {
     let mut srv = test_server(move || {
         HttpService::build()
             .h2(|_| ok::<_, Infallible>(Response::ok().set_body(STR)))
-            .rustls_0_23(tls_config())
+            .rustls_0_22(tls_config())
     })
     .await;
 
@@ -334,7 +333,7 @@ async fn h2_head_empty() {
     let mut srv = test_server(move || {
         HttpService::build()
             .finish(|_| ok::<_, Infallible>(Response::ok().set_body(STR)))
-            .rustls_0_23(tls_config())
+            .rustls_0_22(tls_config())
     })
     .await;
 
@@ -360,7 +359,7 @@ async fn h2_head_binary() {
     let mut srv = test_server(move || {
         HttpService::build()
             .h2(|_| ok::<_, Infallible>(Response::ok().set_body(STR)))
-            .rustls_0_23(tls_config())
+            .rustls_0_22(tls_config())
     })
     .await;
 
@@ -385,7 +384,7 @@ async fn h2_head_binary2() {
     let srv = test_server(move || {
         HttpService::build()
             .h2(|_| ok::<_, Infallible>(Response::ok().set_body(STR)))
-            .rustls_0_23(tls_config())
+            .rustls_0_22(tls_config())
     })
     .await;
 
@@ -411,7 +410,7 @@ async fn h2_body_length() {
                     Response::ok().set_body(SizedStream::new(STR.len() as u64, body)),
                 )
             })
-            .rustls_0_23(tls_config())
+            .rustls_0_22(tls_config())
     })
     .await;
 
@@ -435,7 +434,7 @@ async fn h2_body_chunked_explicit() {
                         .body(BodyStream::new(body)),
                 )
             })
-            .rustls_0_23(tls_config())
+            .rustls_0_22(tls_config())
     })
     .await;
 
@@ -464,7 +463,7 @@ async fn h2_response_http_error_handling() {
                     )
                 }))
             }))
-            .rustls_0_23(tls_config())
+            .rustls_0_22(tls_config())
     })
     .await;
 
@@ -480,7 +479,7 @@ async fn h2_response_http_error_handling() {
 }
 
 #[derive(Debug, Display, Error)]
-#[display("error")]
+#[display(fmt = "error")]
 struct BadRequest;
 
 impl From<BadRequest> for Response<BoxBody> {
@@ -494,7 +493,7 @@ async fn h2_service_error() {
     let mut srv = test_server(move || {
         HttpService::build()
             .h2(|_| err::<Response<BoxBody>, _>(BadRequest))
-            .rustls_0_23(tls_config())
+            .rustls_0_22(tls_config())
     })
     .await;
 
@@ -511,7 +510,7 @@ async fn h1_service_error() {
     let mut srv = test_server(move || {
         HttpService::build()
             .h1(|_| err::<Response<BoxBody>, _>(BadRequest))
-            .rustls_0_23(tls_config())
+            .rustls_0_22(tls_config())
     })
     .await;
 
@@ -534,7 +533,7 @@ async fn alpn_h1() -> io::Result<()> {
         config.alpn_protocols.push(CUSTOM_ALPN_PROTOCOL.to_vec());
         HttpService::build()
             .h1(|_| ok::<_, Error>(Response::ok()))
-            .rustls_0_23(config)
+            .rustls_0_22(config)
     })
     .await;
 
@@ -556,7 +555,7 @@ async fn alpn_h2() -> io::Result<()> {
         config.alpn_protocols.push(CUSTOM_ALPN_PROTOCOL.to_vec());
         HttpService::build()
             .h2(|_| ok::<_, Error>(Response::ok()))
-            .rustls_0_23(config)
+            .rustls_0_22(config)
     })
     .await;
 
@@ -582,7 +581,7 @@ async fn alpn_h2_1() -> io::Result<()> {
         config.alpn_protocols.push(CUSTOM_ALPN_PROTOCOL.to_vec());
         HttpService::build()
             .finish(|_| ok::<_, Error>(Response::ok()))
-            .rustls_0_23(config)
+            .rustls_0_22(config)
     })
     .await;
 

actix-http/tests/test_server.rs

@@ -16,7 +16,6 @@ use actix_utils::future::{err, ok, ready};
 use bytes::Bytes;
 use derive_more::{Display, Error};
 use futures_util::{stream::once, FutureExt as _, StreamExt as _};
-use rand::Rng as _;
 use regex::Regex;
 
 #[actix_rt::test]
@@ -63,7 +62,7 @@ async fn h1_2() {
 }
 
 #[derive(Debug, Display, Error)]
-#[display("expect failed")]
+#[display(fmt = "expect failed")]
 struct ExpectFailed;
 
 impl From<ExpectFailed> for Response<BoxBody> {
@@ -165,10 +164,7 @@ async fn chunked_payload() {
 
         for chunk_size in chunk_sizes.iter() {
             let mut bytes = Vec::new();
-            let random_bytes = rand::rng()
-                .sample_iter(rand::distr::StandardUniform)
-                .take(*chunk_size)
-                .collect::<Vec<_>>();
+            let random_bytes: Vec<u8> = (0..*chunk_size).map(|_| rand::random::<u8>()).collect();
 
             bytes.extend(format!("{:X}\r\n", chunk_size).as_bytes());
             bytes.extend(&random_bytes[..]);
@@ -727,7 +723,7 @@ async fn h1_response_http_error_handling() {
 }
 
 #[derive(Debug, Display, Error)]
-#[display("error")]
+#[display(fmt = "error")]
 struct BadRequest;
 
 impl From<BadRequest> for Response<BoxBody> {

actix-http/tests/test_ws.rs

@@ -37,16 +37,16 @@ impl WsService {
 
 #[derive(Debug, Display, Error, From)]
 enum WsServiceError {
-    #[display("HTTP error")]
+    #[display(fmt = "HTTP error")]
     Http(actix_http::Error),
 
-    #[display("WS handshake error")]
+    #[display(fmt = "WS handshake error")]
     Ws(actix_http::ws::HandshakeError),
 
-    #[display("I/O error")]
+    #[display(fmt = "I/O error")]
     Io(std::io::Error),
 
-    #[display("dispatcher error")]
+    #[display(fmt = "dispatcher error")]
     Dispatcher,
 }
 

actix-multipart-derive/CHANGES.md

@@ -2,10 +2,6 @@
 
 ## Unreleased
 
-## 0.7.0
-
-- Minimum supported Rust version (MSRV) is now 1.72.
-
 ## 0.6.1
 
 - Update `syn` dependency to `2`.

actix-multipart-derive/Cargo.toml

@@ -1,14 +1,13 @@
 [package]
 name = "actix-multipart-derive"
-version = "0.7.0"
+version = "0.6.1"
 authors = ["Jacob Halsey <jacob@jhalsey.com>"]
 description = "Multipart form derive macro for Actix Web"
 keywords = ["http", "web", "framework", "async", "futures"]
-homepage.workspace = true
-repository.workspace = true
-license.workspace = true
-edition.workspace = true
-rust-version.workspace = true
+homepage = "https://actix.rs"
+repository = "https://github.com/actix/actix-web"
+license = "MIT OR Apache-2.0"
+edition = "2021"
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
@@ -18,17 +17,14 @@ all-features = true
 proc-macro = true
 
 [dependencies]
-bytesize = "2"
 darling = "0.20"
+parse-size = "1"
 proc-macro2 = "1"
 quote = "1"
 syn = "2"
 
 [dev-dependencies]
-actix-multipart = "0.7"
+actix-multipart = "0.6"
 actix-web = "4"
-rustversion-msrv = "0.100"
+rustversion = "1"
 trybuild = "1"
-
-[lints]
-workspace = true

actix-multipart-derive/README.md

@@ -5,12 +5,17 @@
 <!-- prettier-ignore-start -->
 
 [![crates.io](https://img.shields.io/crates/v/actix-multipart-derive?label=latest)](https://crates.io/crates/actix-multipart-derive)
-[![Documentation](https://docs.rs/actix-multipart-derive/badge.svg?version=0.7.0)](https://docs.rs/actix-multipart-derive/0.7.0)
-![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+[![Documentation](https://docs.rs/actix-multipart-derive/badge.svg?version=0.6.1)](https://docs.rs/actix-multipart-derive/0.6.1)
+![Version](https://img.shields.io/badge/rustc-1.68+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-multipart-derive.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-multipart-derive/0.7.0/status.svg)](https://deps.rs/crate/actix-multipart-derive/0.7.0)
+[![dependency status](https://deps.rs/crate/actix-multipart-derive/0.6.1/status.svg)](https://deps.rs/crate/actix-multipart-derive/0.6.1)
 [![Download](https://img.shields.io/crates/d/actix-multipart-derive.svg)](https://crates.io/crates/actix-multipart-derive)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 
 <!-- prettier-ignore-end -->
+
+## Documentation & Resources
+
+- [API Documentation](https://docs.rs/actix-multipart-derive)
+- Minimum Supported Rust Version (MSRV): 1.68

actix-multipart-derive/src/lib.rs

@@ -2,15 +2,16 @@
 //!
 //! See [`macro@MultipartForm`] for usage examples.
 
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
-#![allow(clippy::disallowed_names)] // false positives in some macro expansions
 
 use std::collections::HashSet;
 
-use bytesize::ByteSize;
 use darling::{FromDeriveInput, FromField, FromMeta};
+use parse_size::parse_size;
 use proc_macro::TokenStream;
 use proc_macro2::Ident;
 use quote::quote;
@@ -36,7 +37,6 @@ struct MultipartFormAttrs {
     duplicate_field: DuplicateField,
 }
 
-#[allow(clippy::disallowed_names)] // false positive in macro expansion
 #[derive(FromField, Default)]
 #[darling(attributes(multipart), default)]
 struct FieldAttrs {
@@ -103,7 +103,7 @@ struct ParsedField<'t> {
 /// # Field Limits
 ///
 /// You can use the `#[multipart(limit = "<size>")]` attribute to set field level limits. The limit
-/// string is parsed using [`bytesize`].
+/// string is parsed using [parse_size].
 ///
 /// Note: the form is also subject to the global limits configured using `MultipartFormConfig`.
 ///
@@ -138,7 +138,7 @@ struct ParsedField<'t> {
 /// `#[multipart(duplicate_field = "<behavior>")]` attribute:
 ///
 /// - "ignore": (default) Extra fields are ignored. I.e., the first one is persisted.
-/// - "deny": A `MultipartError::UnknownField` error response is returned.
+/// - "deny": A `MultipartError::UnsupportedField` error response is returned.
 /// - "replace": Each field is processed, but only the last one is persisted.
 ///
 /// Note that `Vec` fields will ignore this option.
@@ -150,7 +150,7 @@ struct ParsedField<'t> {
 /// struct Form { }
 /// ```
 ///
-/// [`bytesize`]: https://docs.rs/bytesize/2
+/// [parse_size]: https://docs.rs/parse-size/1/parse_size
 #[proc_macro_derive(MultipartForm, attributes(multipart))]
 pub fn impl_multipart_form(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let input: syn::DeriveInput = parse_macro_input!(input);
@@ -191,8 +191,8 @@ pub fn impl_multipart_form(input: proc_macro::TokenStream) -> proc_macro::TokenS
             let attrs = FieldAttrs::from_field(field).map_err(|err| err.write_errors())?;
             let serialization_name = attrs.rename.unwrap_or_else(|| rust_name.to_string());
 
-            let limit = match attrs.limit.map(|limit| match limit.parse::<ByteSize>() {
-                Ok(ByteSize(size)) => Ok(usize::try_from(size).unwrap()),
+            let limit = match attrs.limit.map(|limit| match parse_size(&limit) {
+                Ok(size) => Ok(usize::try_from(size).unwrap()),
                 Err(err) => Err(syn::Error::new(
                     field.ident.as_ref().unwrap().span(),
                     format!("Could not parse size limit `{}`: {}", limit, err),
@@ -229,7 +229,7 @@ pub fn impl_multipart_form(input: proc_macro::TokenStream) -> proc_macro::TokenS
     // Return value when a field name is not supported by the form
     let unknown_field_result = if attrs.deny_unknown_fields {
         quote!(::std::result::Result::Err(
-            ::actix_multipart::MultipartError::UnknownField(field.name().unwrap().to_string())
+            ::actix_multipart::MultipartError::UnsupportedField(field.name().to_string())
         ))
     } else {
         quote!(::std::result::Result::Ok(()))
@@ -292,7 +292,7 @@ pub fn impl_multipart_form(input: proc_macro::TokenStream) -> proc_macro::TokenS
                 limits: &'t mut ::actix_multipart::form::Limits,
                 state: &'t mut ::actix_multipart::form::State,
             ) -> ::std::pin::Pin<::std::boxed::Box<dyn ::std::future::Future<Output = ::std::result::Result<(), ::actix_multipart::MultipartError>> + 't>> {
-                match field.name().unwrap() {
+                match field.name() {
                     #handle_field_impl
                     _ => return ::std::boxed::Box::pin(::std::future::ready(#unknown_field_result)),
                 }

actix-multipart-derive/tests/trybuild.rs

@@ -1,4 +1,4 @@
-#[rustversion_msrv::msrv]
+#[rustversion::stable(1.68)] // MSRV
 #[test]
 fn compile_macros() {
     let t = trybuild::TestCases::new();

actix-multipart-derive/tests/trybuild/size-limit-parse-fail.stderr

@@ -1,16 +1,16 @@
-error: Could not parse size limit `2 bytes`: couldn't parse "bytes" into a known SI unit, couldn't parse unit of "bytes"
+error: Could not parse size limit `2 bytes`: invalid digit found in string
  --> tests/trybuild/size-limit-parse-fail.rs:6:5
   |
 6 |     description: Text<String>,
   |     ^^^^^^^^^^^
 
-error: Could not parse size limit `2 megabytes`: couldn't parse "megabytes" into a known SI unit, couldn't parse unit of "megabytes"
+error: Could not parse size limit `2 megabytes`: invalid digit found in string
   --> tests/trybuild/size-limit-parse-fail.rs:12:5
    |
 12 |     description: Text<String>,
    |     ^^^^^^^^^^^
 
-error: Could not parse size limit `four meters`: couldn't parse "four meters" into a ByteSize, cannot parse float from empty string
+error: Could not parse size limit `four meters`: invalid digit found in string
   --> tests/trybuild/size-limit-parse-fail.rs:18:5
    |
 18 |     description: Text<String>,

actix-multipart/CHANGES.md

@@ -2,33 +2,6 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.75.
-
-## 0.7.2
-
-- Fix re-exported version of `actix-multipart-derive`.
-
-## 0.7.1
-
-- Expose `LimitExceeded` error type.
-
-## 0.7.0
-
-- Add `MultipartError::ContentTypeIncompatible` variant.
-- Add `MultipartError::ContentDispositionNameMissing` variant.
-- Add `Field::bytes()` method.
-- Rename `MultipartError::{NoContentDisposition => ContentDispositionMissing}` variant.
-- Rename `MultipartError::{NoContentType => ContentTypeMissing}` variant.
-- Rename `MultipartError::{ParseContentType => ContentTypeParse}` variant.
-- Rename `MultipartError::{Boundary => BoundaryMissing}` variant.
-- Rename `MultipartError::{UnsupportedField => UnknownField}` variant.
-- Remove top-level re-exports of `test` utilities.
-
-## 0.6.2
-
-- Add testing utilities under new module `test`.
-- Minimum supported Rust version (MSRV) is now 1.72.
-
 ## 0.6.1
 
 - Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.

actix-multipart/Cargo.toml

@@ -1,48 +1,33 @@
 [package]
 name = "actix-multipart"
-version = "0.7.2"
+version = "0.6.1"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "Jacob Halsey <jacob@jhalsey.com>",
-    "Rob Ede <robjtede@icloud.com>",
 ]
-description = "Multipart request & form support for Actix Web"
-keywords = ["http", "actix", "web", "multipart", "form"]
-homepage.workspace = true
-repository.workspace = true
-license.workspace = true
-edition.workspace = true
+description = "Multipart form support for Actix Web"
+keywords = ["http", "web", "framework", "async", "futures"]
+homepage = "https://actix.rs"
+repository = "https://github.com/actix/actix-web"
+license = "MIT OR Apache-2.0"
+edition = "2021"
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
 all-features = true
 
-[package.metadata.cargo_check_external_types]
-allowed_external_types = [
-    "actix_http::*",
-    "actix_multipart_derive::*",
-    "actix_utils::*",
-    "actix_web::*",
-    "bytes::*",
-    "futures_core::*",
-    "mime::*",
-    "serde_json::*",
-    "serde_plain::*",
-    "serde::*",
-    "tempfile::*",
-]
-
 [features]
 default = ["tempfile", "derive"]
 derive = ["actix-multipart-derive"]
 tempfile = ["dep:tempfile", "tokio/fs"]
 
 [dependencies]
-actix-multipart-derive = { version = "=0.7.0", optional = true }
+actix-multipart-derive = { version = "=0.6.1", optional = true }
 actix-utils = "3"
 actix-web = { version = "4", default-features = false }
 
-derive_more = { version = "2", features = ["display", "error", "from"] }
+bytes = "1"
+derive_more = "0.99.5"
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
 httparse = "1.3"
@@ -50,7 +35,6 @@ local-waker = "0.1"
 log = "0.4"
 memchr = "2.5"
 mime = "0.3"
-rand = "0.9"
 serde = "1"
 serde_json = "1"
 serde_plain = "1"
@@ -59,18 +43,10 @@ tokio = { version = "1.24.2", features = ["sync", "io-util"] }
 
 [dev-dependencies]
 actix-http = "3"
-actix-multipart-rfc7578 = "0.11"
+actix-multipart-rfc7578 = "0.10"
 actix-rt = "2.2"
 actix-test = "0.1"
-actix-web = "4"
-assert_matches = "1"
 awc = "3"
-env_logger = "0.11"
 futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
-futures-test = "0.3"
-multer = "3"
 tokio = { version = "1.24.2", features = ["sync"] }
 tokio-stream = "0.1"
-
-[lints]
-workspace = true

actix-multipart/README.md

@@ -1,74 +1,21 @@
 # `actix-multipart`
 
+> Multipart form support for Actix Web.
+
 <!-- prettier-ignore-start -->
 
 [![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.7.2)](https://docs.rs/actix-multipart/0.7.2)
-![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+[![Documentation](https://docs.rs/actix-multipart/badge.svg?version=0.6.1)](https://docs.rs/actix-multipart/0.6.1)
+![Version](https://img.shields.io/badge/rustc-1.68+-ab6000.svg)
 ![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.7.2/status.svg)](https://deps.rs/crate/actix-multipart/0.7.2)
+[![dependency status](https://deps.rs/crate/actix-multipart/0.6.1/status.svg)](https://deps.rs/crate/actix-multipart/0.6.1)
 [![Download](https://img.shields.io/crates/d/actix-multipart.svg)](https://crates.io/crates/actix-multipart)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 
 <!-- prettier-ignore-end -->
 
-<!-- cargo-rdme start -->
+## Documentation & Resources
 
-Multipart request & form support for Actix Web.
-
-The [`Multipart`] extractor aims to support all kinds of `multipart/*` requests, including `multipart/form-data`, `multipart/related` and `multipart/mixed`. This is a lower-level extractor which supports reading [multipart fields](Field), in the order they are sent by the client.
-
-Due to additional requirements for `multipart/form-data` requests, the higher level [`MultipartForm`] extractor and derive macro only supports this media type.
-
-## Examples
-
-```rust
-use actix_web::{post, App, HttpServer, Responder};
-
-use actix_multipart::form::{json::Json as MpJson, tempfile::TempFile, MultipartForm};
-use serde::Deserialize;
-
-#[derive(Debug, Deserialize)]
-struct Metadata {
-    name: String,
-}
-
-#[derive(Debug, MultipartForm)]
-struct UploadForm {
-    #[multipart(limit = "100MB")]
-    file: TempFile,
-    json: MpJson<Metadata>,
-}
-
-#[post("/videos")]
-pub async fn post_video(MultipartForm(form): MultipartForm<UploadForm>) -> impl Responder {
-    format!(
-        "Uploaded file {}, with size: {}",
-        form.json.name, form.file.size
-    )
-}
-
-#[actix_web::main]
-async fn main() -> std::io::Result<()> {
-    HttpServer::new(move || App::new().service(post_video))
-        .bind(("127.0.0.1", 8080))?
-        .run()
-        .await
-}
-```
-
-cURL request:
-
-```sh
-curl -v --request POST \
-  --url http://localhost:8080/videos \
-  -F 'json={"name": "Cargo.lock"};type=application/json' \
-  -F file=@./Cargo.lock
-```
-
-[`MultipartForm`]: struct@form::MultipartForm
-
-<!-- cargo-rdme end -->
-
-[More available in the examples repo &rarr;](https://github.com/actix/examples/tree/master/forms/multipart)
+- [API Documentation](https://docs.rs/actix-multipart)
+- Minimum Supported Rust Version (MSRV): 1.68

actix-multipart/examples/form.rs

@@ -1,36 +0,0 @@
-use actix_multipart::form::{json::Json as MpJson, tempfile::TempFile, MultipartForm};
-use actix_web::{middleware::Logger, post, App, HttpServer, Responder};
-use serde::Deserialize;
-
-#[derive(Debug, Deserialize)]
-struct Metadata {
-    name: String,
-}
-
-#[derive(Debug, MultipartForm)]
-struct UploadForm {
-    #[multipart(limit = "100MB")]
-    file: TempFile,
-    json: MpJson<Metadata>,
-}
-
-#[post("/videos")]
-async fn post_video(MultipartForm(form): MultipartForm<UploadForm>) -> impl Responder {
-    format!(
-        "Uploaded file {}, with size: {}\ntemporary file ({}) was deleted\n",
-        form.json.name,
-        form.file.size,
-        form.file.file.path().display(),
-    )
-}
-
-#[actix_web::main]
-async fn main() -> std::io::Result<()> {
-    env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
-
-    HttpServer::new(move || App::new().service(post_video).wrap(Logger::default()))
-        .workers(2)
-        .bind(("127.0.0.1", 8080))?
-        .run()
-        .await
-}

actix-multipart/src/error.rs

@@ -10,96 +10,78 @@ use derive_more::{Display, Error, From};
 /// A set of errors that can occur during parsing multipart streams.
 #[derive(Debug, Display, From, Error)]
 #[non_exhaustive]
-pub enum Error {
-    /// Could not find Content-Type header.
-    #[display("Could not find Content-Type header")]
-    ContentTypeMissing,
-
-    /// Could not parse Content-Type header.
-    #[display("Could not parse Content-Type header")]
-    ContentTypeParse,
-
-    /// Parsed Content-Type did not have "multipart" top-level media type.
+pub enum MultipartError {
+    /// Content-Disposition header is not found or is not equal to "form-data".
     ///
-    /// Also raised when extracting a [`MultipartForm`] from a request that does not have the
-    /// "multipart/form-data" media type.
-    ///
-    /// [`MultipartForm`]: struct@crate::form::MultipartForm
-    #[display("Parsed Content-Type did not have 'multipart' top-level media type")]
-    ContentTypeIncompatible,
+    /// According to [RFC 7578 §4.2](https://datatracker.ietf.org/doc/html/rfc7578#section-4.2) a
+    /// Content-Disposition header must always be present and equal to "form-data".
+    #[display(fmt = "No Content-Disposition `form-data` header")]
+    NoContentDisposition,
 
-    /// Multipart boundary is not found.
-    #[display("Multipart boundary is not found")]
-    BoundaryMissing,
+    /// Content-Type header is not found
+    #[display(fmt = "No Content-Type header found")]
+    NoContentType,
 
-    /// Content-Disposition header was not found or not of disposition type "form-data" when parsing
-    /// a "form-data" field.
-    ///
-    /// As per [RFC 7578 §4.2], a "multipart/form-data" field's Content-Disposition header must
-    /// always be present and have a disposition type of "form-data".
-    ///
-    /// [RFC 7578 §4.2]: https://datatracker.ietf.org/doc/html/rfc7578#section-4.2
-    #[display("Content-Disposition header was not found when parsing a \"form-data\" field")]
-    ContentDispositionMissing,
+    /// Can not parse Content-Type header
+    #[display(fmt = "Can not parse Content-Type header")]
+    ParseContentType,
 
-    /// Content-Disposition name parameter was not found when parsing a "form-data" field.
-    ///
-    /// As per [RFC 7578 §4.2], a "multipart/form-data" field's Content-Disposition header must
-    /// always include a "name" parameter.
-    ///
-    /// [RFC 7578 §4.2]: https://datatracker.ietf.org/doc/html/rfc7578#section-4.2
-    #[display("Content-Disposition header was not found when parsing a \"form-data\" field")]
-    ContentDispositionNameMissing,
+    /// Multipart boundary is not found
+    #[display(fmt = "Multipart boundary is not found")]
+    Boundary,
 
-    /// Nested multipart is not supported.
-    #[display("Nested multipart is not supported")]
+    /// Nested multipart is not supported
+    #[display(fmt = "Nested multipart is not supported")]
     Nested,
 
-    /// Multipart stream is incomplete.
-    #[display("Multipart stream is incomplete")]
+    /// Multipart stream is incomplete
+    #[display(fmt = "Multipart stream is incomplete")]
     Incomplete,
 
-    /// Field parsing failed.
-    #[display("Error during field parsing")]
+    /// Error during field parsing
+    #[display(fmt = "{}", _0)]
     Parse(ParseError),
 
-    /// HTTP payload error.
-    #[display("Payload error")]
+    /// Payload error
+    #[display(fmt = "{}", _0)]
     Payload(PayloadError),
 
-    /// Stream is not consumed.
-    #[display("Stream is not consumed")]
+    /// Not consumed
+    #[display(fmt = "Multipart stream is not consumed")]
     NotConsumed,
 
-    /// Form field handler raised error.
-    #[display("An error occurred processing field: {name}")]
+    /// An error from a field handler in a form
+    #[display(
+        fmt = "An error occurred processing field `{}`: {}",
+        field_name,
+        source
+    )]
     Field {
-        name: String,
+        field_name: String,
         source: actix_web::Error,
     },
 
-    /// Duplicate field found (for structure that opted-in to denying duplicate fields).
-    #[display("Duplicate field found: {_0}")]
+    /// Duplicate field
+    #[display(fmt = "Duplicate field found for: `{}`", _0)]
     #[from(ignore)]
     DuplicateField(#[error(not(source))] String),
 
-    /// Required field is missing.
-    #[display("Required field is missing: {_0}")]
+    /// Missing field
+    #[display(fmt = "Field with name `{}` is required", _0)]
     #[from(ignore)]
     MissingField(#[error(not(source))] String),
 
-    /// Unknown field (for structure that opted-in to denying unknown fields).
-    #[display("Unknown field: {_0}")]
+    /// Unknown field
+    #[display(fmt = "Unsupported field `{}`", _0)]
     #[from(ignore)]
-    UnknownField(#[error(not(source))] String),
+    UnsupportedField(#[error(not(source))] String),
 }
 
-/// Return `BadRequest` for `MultipartError`.
-impl ResponseError for Error {
+/// Return `BadRequest` for `MultipartError`
+impl ResponseError for MultipartError {
     fn status_code(&self) -> StatusCode {
         match &self {
-            Error::Field { source, .. } => source.as_response_error().status_code(),
-            Error::ContentTypeIncompatible => StatusCode::UNSUPPORTED_MEDIA_TYPE,
+            MultipartError::Field { source, .. } => source.as_response_error().status_code(),
             _ => StatusCode::BAD_REQUEST,
         }
     }
@@ -111,7 +93,7 @@ mod tests {
 
     #[test]
     fn test_multipart_error() {
-        let resp = Error::BoundaryMissing.error_response();
+        let resp = MultipartError::Boundary.error_response();
         assert_eq!(resp.status(), StatusCode::BAD_REQUEST);
     }
 }

actix-multipart/src/extractor.rs

@@ -1,20 +1,21 @@
+//! Multipart payload support
+
 use actix_utils::future::{ready, Ready};
 use actix_web::{dev::Payload, Error, FromRequest, HttpRequest};
 
-use crate::multipart::Multipart;
+use crate::server::Multipart;
 
-/// Extract request's payload as multipart stream.
+/// Get request's payload as multipart stream.
 ///
-/// Content-type: multipart/*;
+/// Content-type: multipart/form-data;
 ///
 /// # Examples
-///
 /// ```
-/// use actix_web::{web, HttpResponse};
+/// use actix_web::{web, HttpResponse, Error};
 /// use actix_multipart::Multipart;
 /// use futures_util::StreamExt as _;
 ///
-/// async fn index(mut payload: Multipart) -> actix_web::Result<HttpResponse> {
+/// async fn index(mut payload: Multipart) -> Result<HttpResponse, Error> {
 ///     // iterate over multipart stream
 ///     while let Some(item) = payload.next().await {
 ///            let mut field = item?;
@@ -25,7 +26,7 @@ use crate::multipart::Multipart;
 ///            }
 ///     }
 ///
-///     Ok(HttpResponse::Ok().finish())
+///     Ok(HttpResponse::Ok().into())
 /// }
 /// ```
 impl FromRequest for Multipart {
@@ -34,6 +35,9 @@ impl FromRequest for Multipart {
 
     #[inline]
     fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
-        ready(Ok(Multipart::from_req(req, payload)))
+        ready(Ok(match Multipart::boundary(req.headers()) {
+            Ok(boundary) => Multipart::from_boundary(boundary, payload.take()),
+            Err(err) => Multipart::from_error(err),
+        }))
     }
 }

actix-multipart/src/field.rs

@@ -1,501 +0,0 @@
-use std::{
-    cell::RefCell,
-    cmp, fmt,
-    future::poll_fn,
-    mem,
-    pin::Pin,
-    rc::Rc,
-    task::{ready, Context, Poll},
-};
-
-use actix_web::{
-    error::PayloadError,
-    http::header::{self, ContentDisposition, HeaderMap},
-    web::{Bytes, BytesMut},
-};
-use derive_more::{Display, Error};
-use futures_core::Stream;
-use mime::Mime;
-
-use crate::{
-    error::Error,
-    payload::{PayloadBuffer, PayloadRef},
-    safety::Safety,
-};
-
-/// Error type returned from [`Field::bytes()`] when field data is larger than limit.
-#[derive(Debug, Display, Error)]
-#[display("size limit exceeded while collecting field data")]
-#[non_exhaustive]
-pub struct LimitExceeded;
-
-/// A single field in a multipart stream.
-pub struct Field {
-    /// Field's Content-Type.
-    content_type: Option<Mime>,
-
-    /// Field's Content-Disposition.
-    content_disposition: Option<ContentDisposition>,
-
-    /// Form field name.
-    ///
-    /// A non-optional storage for form field names to avoid unwraps in `form` module. Will be an
-    /// empty string in non-form contexts.
-    ///
-    // INVARIANT: always non-empty when request content-type is multipart/form-data.
-    pub(crate) form_field_name: String,
-
-    /// Field's header map.
-    headers: HeaderMap,
-
-    safety: Safety,
-    inner: Rc<RefCell<InnerField>>,
-}
-
-impl Field {
-    pub(crate) fn new(
-        content_type: Option<Mime>,
-        content_disposition: Option<ContentDisposition>,
-        form_field_name: Option<String>,
-        headers: HeaderMap,
-        safety: Safety,
-        inner: Rc<RefCell<InnerField>>,
-    ) -> Self {
-        Field {
-            content_type,
-            content_disposition,
-            form_field_name: form_field_name.unwrap_or_default(),
-            headers,
-            inner,
-            safety,
-        }
-    }
-
-    /// Returns a reference to the field's header map.
-    pub fn headers(&self) -> &HeaderMap {
-        &self.headers
-    }
-
-    /// Returns a reference to the field's content (mime) type, if it is supplied by the client.
-    ///
-    /// According to [RFC 7578](https://www.rfc-editor.org/rfc/rfc7578#section-4.4), if it is not
-    /// present, it should default to "text/plain". Note it is the responsibility of the client to
-    /// provide the appropriate content type, there is no attempt to validate this by the server.
-    pub fn content_type(&self) -> Option<&Mime> {
-        self.content_type.as_ref()
-    }
-
-    /// Returns this field's parsed Content-Disposition header, if set.
-    ///
-    /// # Validation
-    ///
-    /// Per [RFC 7578 §4.2], the parts of a multipart/form-data payload MUST contain a
-    /// Content-Disposition header field where the disposition type is `form-data` and MUST also
-    /// contain an additional parameter of `name` with its value being the original field name from
-    /// the form. This requirement is enforced during extraction for multipart/form-data requests,
-    /// but not other kinds of multipart requests (such as multipart/related).
-    ///
-    /// As such, it is safe to `.unwrap()` calls `.content_disposition()` if you've verified.
-    ///
-    /// The [`name()`](Self::name) method is also provided as a convenience for obtaining the
-    /// aforementioned name parameter.
-    ///
-    /// [RFC 7578 §4.2]: https://datatracker.ietf.org/doc/html/rfc7578#section-4.2
-    pub fn content_disposition(&self) -> Option<&ContentDisposition> {
-        self.content_disposition.as_ref()
-    }
-
-    /// Returns the field's name, if set.
-    ///
-    /// See [`content_disposition()`](Self::content_disposition) regarding guarantees on presence of
-    /// the "name" field.
-    pub fn name(&self) -> Option<&str> {
-        self.content_disposition()?.get_name()
-    }
-
-    /// Collects the raw field data, up to `limit` bytes.
-    ///
-    /// # Errors
-    ///
-    /// Any errors produced by the data stream are returned as `Ok(Err(Error))` immediately.
-    ///
-    /// If the buffered data size would exceed `limit`, an `Err(LimitExceeded)` is returned. Note
-    /// that, in this case, the full data stream is exhausted before returning the error so that
-    /// subsequent fields can still be read. To better defend against malicious/infinite requests,
-    /// it is advisable to also put a timeout on this call.
-    pub async fn bytes(&mut self, limit: usize) -> Result<Result<Bytes, Error>, LimitExceeded> {
-        /// Sensible default (2kB) for initial, bounded allocation when collecting body bytes.
-        const INITIAL_ALLOC_BYTES: usize = 2 * 1024;
-
-        let mut exceeded_limit = false;
-        let mut buf = BytesMut::with_capacity(INITIAL_ALLOC_BYTES);
-
-        let mut field = Pin::new(self);
-
-        match poll_fn(|cx| loop {
-            match ready!(field.as_mut().poll_next(cx)) {
-                // if already over limit, discard chunk to advance multipart request
-                Some(Ok(_chunk)) if exceeded_limit => {}
-
-                // if limit is exceeded set flag to true and continue
-                Some(Ok(chunk)) if buf.len() + chunk.len() > limit => {
-                    exceeded_limit = true;
-                    // eagerly de-allocate field data buffer
-                    let _ = mem::take(&mut buf);
-                }
-
-                Some(Ok(chunk)) => buf.extend_from_slice(&chunk),
-
-                None => return Poll::Ready(Ok(())),
-                Some(Err(err)) => return Poll::Ready(Err(err)),
-            }
-        })
-        .await
-        {
-            // propagate error returned from body poll
-            Err(err) => Ok(Err(err)),
-
-            // limit was exceeded while reading body
-            Ok(()) if exceeded_limit => Err(LimitExceeded),
-
-            // otherwise return body buffer
-            Ok(()) => Ok(Ok(buf.freeze())),
-        }
-    }
-}
-
-impl Stream for Field {
-    type Item = Result<Bytes, Error>;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        let this = self.get_mut();
-        let mut inner = this.inner.borrow_mut();
-
-        if let Some(mut buffer) = inner
-            .payload
-            .as_ref()
-            .expect("Field should not be polled after completion")
-            .get_mut(&this.safety)
-        {
-            // check safety and poll read payload to buffer.
-            buffer.poll_stream(cx)?;
-        } else if !this.safety.is_clean() {
-            // safety violation
-            return Poll::Ready(Some(Err(Error::NotConsumed)));
-        } else {
-            return Poll::Pending;
-        }
-
-        inner.poll(&this.safety)
-    }
-}
-
-impl fmt::Debug for Field {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if let Some(ct) = &self.content_type {
-            writeln!(f, "\nField: {}", ct)?;
-        } else {
-            writeln!(f, "\nField:")?;
-        }
-        writeln!(f, "  boundary: {}", self.inner.borrow().boundary)?;
-        writeln!(f, "  headers:")?;
-        for (key, val) in self.headers.iter() {
-            writeln!(f, "    {:?}: {:?}", key, val)?;
-        }
-        Ok(())
-    }
-}
-
-pub(crate) struct InnerField {
-    /// Payload is initialized as Some and is `take`n when the field stream finishes.
-    payload: Option<PayloadRef>,
-
-    /// Field boundary (without "--" prefix).
-    boundary: String,
-
-    /// True if request payload has been exhausted.
-    eof: bool,
-
-    /// Field data's stated size according to it's Content-Length header.
-    length: Option<u64>,
-}
-
-impl InnerField {
-    pub(crate) fn new_in_rc(
-        payload: PayloadRef,
-        boundary: String,
-        headers: &HeaderMap,
-    ) -> Result<Rc<RefCell<InnerField>>, PayloadError> {
-        Self::new(payload, boundary, headers).map(|this| Rc::new(RefCell::new(this)))
-    }
-
-    pub(crate) fn new(
-        payload: PayloadRef,
-        boundary: String,
-        headers: &HeaderMap,
-    ) -> Result<InnerField, PayloadError> {
-        let len = if let Some(len) = headers.get(&header::CONTENT_LENGTH) {
-            match len.to_str().ok().and_then(|len| len.parse::<u64>().ok()) {
-                Some(len) => Some(len),
-                None => return Err(PayloadError::Incomplete(None)),
-            }
-        } else {
-            None
-        };
-
-        Ok(InnerField {
-            boundary,
-            payload: Some(payload),
-            eof: false,
-            length: len,
-        })
-    }
-
-    /// Reads body part content chunk of the specified size.
-    ///
-    /// The body part must has `Content-Length` header with proper value.
-    pub(crate) fn read_len(
-        payload: &mut PayloadBuffer,
-        size: &mut u64,
-    ) -> Poll<Option<Result<Bytes, Error>>> {
-        if *size == 0 {
-            Poll::Ready(None)
-        } else {
-            match payload.read_max(*size)? {
-                Some(mut chunk) => {
-                    let len = cmp::min(chunk.len() as u64, *size);
-                    *size -= len;
-                    let ch = chunk.split_to(len as usize);
-                    if !chunk.is_empty() {
-                        payload.unprocessed(chunk);
-                    }
-                    Poll::Ready(Some(Ok(ch)))
-                }
-                None => {
-                    if payload.eof && (*size != 0) {
-                        Poll::Ready(Some(Err(Error::Incomplete)))
-                    } else {
-                        Poll::Pending
-                    }
-                }
-            }
-        }
-    }
-
-    /// Reads content chunk of body part with unknown length.
-    ///
-    /// The `Content-Length` header for body part is not necessary.
-    pub(crate) fn read_stream(
-        payload: &mut PayloadBuffer,
-        boundary: &str,
-    ) -> Poll<Option<Result<Bytes, Error>>> {
-        let mut pos = 0;
-
-        let len = payload.buf.len();
-
-        if len == 0 {
-            return if payload.eof {
-                Poll::Ready(Some(Err(Error::Incomplete)))
-            } else {
-                Poll::Pending
-            };
-        }
-
-        // check boundary
-        if len > 4 && payload.buf[0] == b'\r' {
-            let b_len = if payload.buf.starts_with(b"\r\n") && &payload.buf[2..4] == b"--" {
-                Some(4)
-            } else if &payload.buf[1..3] == b"--" {
-                Some(3)
-            } else {
-                None
-            };
-
-            if let Some(b_len) = b_len {
-                let b_size = boundary.len() + b_len;
-                if len < b_size {
-                    return Poll::Pending;
-                } else if &payload.buf[b_len..b_size] == boundary.as_bytes() {
-                    // found boundary
-                    return Poll::Ready(None);
-                }
-            }
-        }
-
-        loop {
-            return if let Some(idx) = memchr::memmem::find(&payload.buf[pos..], b"\r") {
-                let cur = pos + idx;
-
-                // check if we have enough data for boundary detection
-                if cur + 4 > len {
-                    if cur > 0 {
-                        Poll::Ready(Some(Ok(payload.buf.split_to(cur).freeze())))
-                    } else {
-                        Poll::Pending
-                    }
-                } else {
-                    // check boundary
-                    if (&payload.buf[cur..cur + 2] == b"\r\n"
-                        && &payload.buf[cur + 2..cur + 4] == b"--")
-                        || (&payload.buf[cur..=cur] == b"\r"
-                            && &payload.buf[cur + 1..cur + 3] == b"--")
-                    {
-                        if cur != 0 {
-                            // return buffer
-                            Poll::Ready(Some(Ok(payload.buf.split_to(cur).freeze())))
-                        } else {
-                            pos = cur + 1;
-                            continue;
-                        }
-                    } else {
-                        // not boundary
-                        pos = cur + 1;
-                        continue;
-                    }
-                }
-            } else {
-                Poll::Ready(Some(Ok(payload.buf.split().freeze())))
-            };
-        }
-    }
-
-    pub(crate) fn poll(&mut self, safety: &Safety) -> Poll<Option<Result<Bytes, Error>>> {
-        if self.payload.is_none() {
-            return Poll::Ready(None);
-        }
-
-        let Some(mut payload) = self
-            .payload
-            .as_ref()
-            .expect("Field should not be polled after completion")
-            .get_mut(safety)
-        else {
-            return Poll::Pending;
-        };
-
-        if !self.eof {
-            let res = if let Some(ref mut len) = self.length {
-                Self::read_len(&mut payload, len)
-            } else {
-                Self::read_stream(&mut payload, &self.boundary)
-            };
-
-            match ready!(res) {
-                Some(Ok(bytes)) => return Poll::Ready(Some(Ok(bytes))),
-                Some(Err(err)) => return Poll::Ready(Some(Err(err))),
-                None => self.eof = true,
-            }
-        }
-
-        let result = match payload.readline() {
-            Ok(None) => Poll::Pending,
-            Ok(Some(line)) => {
-                if line.as_ref() != b"\r\n" {
-                    log::warn!("multipart field did not read all the data or it is malformed");
-                }
-                Poll::Ready(None)
-            }
-            Err(err) => Poll::Ready(Some(Err(err))),
-        };
-
-        drop(payload);
-
-        if let Poll::Ready(None) = result {
-            // drop payload buffer and make future un-poll-able
-            let _ = self.payload.take();
-        }
-
-        result
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use futures_util::{stream, StreamExt as _};
-
-    use super::*;
-    use crate::Multipart;
-
-    // TODO: use test utility when multi-file support is introduced
-    fn create_double_request_with_header() -> (Bytes, HeaderMap) {
-        let bytes = Bytes::from(
-            "testasdadsad\r\n\
-             --abbc761f78ff4d7cb7573b5a23f96ef0\r\n\
-             Content-Disposition: form-data; name=\"file\"; filename=\"fn.txt\"\r\n\
-             Content-Type: text/plain; charset=utf-8\r\n\
-             \r\n\
-             one+one+one\r\n\
-             --abbc761f78ff4d7cb7573b5a23f96ef0\r\n\
-             Content-Disposition: form-data; name=\"file\"; filename=\"fn.txt\"\r\n\
-             Content-Type: text/plain; charset=utf-8\r\n\
-             \r\n\
-             two+two+two\r\n\
-             --abbc761f78ff4d7cb7573b5a23f96ef0--\r\n",
-        );
-        let mut headers = HeaderMap::new();
-        headers.insert(
-            header::CONTENT_TYPE,
-            header::HeaderValue::from_static(
-                "multipart/mixed; boundary=\"abbc761f78ff4d7cb7573b5a23f96ef0\"",
-            ),
-        );
-        (bytes, headers)
-    }
-
-    #[actix_rt::test]
-    async fn bytes_unlimited() {
-        let (body, headers) = create_double_request_with_header();
-
-        let mut multipart = Multipart::new(&headers, stream::iter([Ok(body)]));
-
-        let field = multipart
-            .next()
-            .await
-            .expect("multipart should have two fields")
-            .expect("multipart body should be well formatted")
-            .bytes(usize::MAX)
-            .await
-            .expect("field data should not be size limited")
-            .expect("reading field data should not error");
-        assert_eq!(field, "one+one+one");
-
-        let field = multipart
-            .next()
-            .await
-            .expect("multipart should have two fields")
-            .expect("multipart body should be well formatted")
-            .bytes(usize::MAX)
-            .await
-            .expect("field data should not be size limited")
-            .expect("reading field data should not error");
-        assert_eq!(field, "two+two+two");
-    }
-
-    #[actix_rt::test]
-    async fn bytes_limited() {
-        let (body, headers) = create_double_request_with_header();
-
-        let mut multipart = Multipart::new(&headers, stream::iter([Ok(body)]));
-
-        multipart
-            .next()
-            .await
-            .expect("multipart should have two fields")
-            .expect("multipart body should be well formatted")
-            .bytes(8) // smaller than data size
-            .await
-            .expect_err("field data should be size limited");
-
-        // next field still readable
-        let field = multipart
-            .next()
-            .await
-            .expect("multipart should have two fields")
-            .expect("multipart body should be well formatted")
-            .bytes(usize::MAX)
-            .await
-            .expect("field data should not be size limited")
-            .expect("reading field data should not error");
-        assert_eq!(field, "two+two+two");
-    }
-}

actix-multipart/src/form/bytes.rs

@@ -1,6 +1,7 @@
 //! Reads a field into memory.
 
-use actix_web::{web::BytesMut, HttpRequest};
+use actix_web::HttpRequest;
+use bytes::BytesMut;
 use futures_core::future::LocalBoxFuture;
 use futures_util::TryStreamExt as _;
 use mime::Mime;
@@ -14,7 +15,7 @@ use crate::{
 #[derive(Debug)]
 pub struct Bytes {
     /// The data.
-    pub data: actix_web::web::Bytes,
+    pub data: bytes::Bytes,
 
     /// The value of the `Content-Type` header.
     pub content_type: Option<Mime>,
@@ -40,9 +41,8 @@ impl<'t> FieldReader<'t> for Bytes {
                 content_type: field.content_type().map(ToOwned::to_owned),
                 file_name: field
                     .content_disposition()
-                    .expect("multipart form fields should have a content-disposition header")
                     .get_filename()
-                    .map(ToOwned::to_owned),
+                    .map(str::to_owned),
             })
         })
     }

actix-multipart/src/form/json.rs

@@ -32,6 +32,7 @@ where
     fn read_field(req: &'t HttpRequest, field: Field, limits: &'t mut Limits) -> Self::Future {
         Box::pin(async move {
             let config = JsonConfig::from_req(req);
+            let field_name = field.name().to_owned();
 
             if config.validate_content_type {
                 let valid = if let Some(mime) = field.content_type() {
@@ -42,19 +43,17 @@ where
 
                 if !valid {
                     return Err(MultipartError::Field {
-                        name: field.form_field_name,
+                        field_name,
                         source: config.map_error(req, JsonFieldError::ContentType),
                     });
                 }
             }
 
-            let form_field_name = field.form_field_name.clone();
-
             let bytes = Bytes::read_field(req, field, limits).await?;
 
             Ok(Json(serde_json::from_slice(bytes.data.as_ref()).map_err(
                 |err| MultipartError::Field {
-                    name: form_field_name,
+                    field_name,
                     source: config.map_error(req, JsonFieldError::Deserialize(err)),
                 },
             )?))
@@ -66,11 +65,11 @@ where
 #[non_exhaustive]
 pub enum JsonFieldError {
     /// Deserialize error.
-    #[display("Json deserialize error: {}", _0)]
+    #[display(fmt = "Json deserialize error: {}", _0)]
     Deserialize(serde_json::Error),
 
     /// Content type error.
-    #[display("Content type error")]
+    #[display(fmt = "Content type error")]
     ContentType,
 }
 
@@ -132,12 +131,14 @@ impl Default for JsonConfig {
 
 #[cfg(test)]
 mod tests {
-    use std::collections::HashMap;
+    use std::{collections::HashMap, io::Cursor};
 
-    use actix_web::{http::StatusCode, web, web::Bytes, App, HttpResponse, Responder};
+    use actix_multipart_rfc7578::client::multipart;
+    use actix_web::{http::StatusCode, web, App, HttpResponse, Responder};
 
     use crate::form::{
         json::{Json, JsonConfig},
+        tests::send_form,
         MultipartForm,
     };
 
@@ -154,8 +155,6 @@ mod tests {
         HttpResponse::Ok().finish()
     }
 
-    const TEST_JSON: &str = r#"{"key1": "value1", "key2": "value2"}"#;
-
     #[actix_rt::test]
     async fn test_json_without_content_type() {
         let srv = actix_test::start(|| {
@@ -164,16 +163,10 @@ mod tests {
                 .app_data(JsonConfig::default().validate_content_type(false))
         });
 
-        let (body, headers) = crate::test::create_form_data_payload_and_headers(
-            "json",
-            None,
-            None,
-            Bytes::from_static(TEST_JSON.as_bytes()),
-        );
-        let mut req = srv.post("/");
-        *req.headers_mut() = headers;
-        let res = req.send_body(body).await.unwrap();
-        assert_eq!(res.status(), StatusCode::OK);
+        let mut form = multipart::Form::default();
+        form.add_text("json", "{\"key1\": \"value1\", \"key2\": \"value2\"}");
+        let response = send_form(&srv, form, "/").await;
+        assert_eq!(response.status(), StatusCode::OK);
     }
 
     #[actix_rt::test]
@@ -185,27 +178,17 @@ mod tests {
         });
 
         // Deny because wrong content type
-        let (body, headers) = crate::test::create_form_data_payload_and_headers(
-            "json",
-            None,
-            Some(mime::APPLICATION_OCTET_STREAM),
-            Bytes::from_static(TEST_JSON.as_bytes()),
-        );
-        let mut req = srv.post("/");
-        *req.headers_mut() = headers;
-        let res = req.send_body(body).await.unwrap();
-        assert_eq!(res.status(), StatusCode::BAD_REQUEST);
+        let bytes = Cursor::new("{\"key1\": \"value1\", \"key2\": \"value2\"}");
+        let mut form = multipart::Form::default();
+        form.add_reader_file_with_mime("json", bytes, "", mime::APPLICATION_OCTET_STREAM);
+        let response = send_form(&srv, form, "/").await;
+        assert_eq!(response.status(), StatusCode::BAD_REQUEST);
 
         // Allow because correct content type
-        let (body, headers) = crate::test::create_form_data_payload_and_headers(
-            "json",
-            None,
-            Some(mime::APPLICATION_JSON),
-            Bytes::from_static(TEST_JSON.as_bytes()),
-        );
-        let mut req = srv.post("/");
-        *req.headers_mut() = headers;
-        let res = req.send_body(body).await.unwrap();
-        assert_eq!(res.status(), StatusCode::OK);
+        let bytes = Cursor::new("{\"key1\": \"value1\", \"key2\": \"value2\"}");
+        let mut form = multipart::Form::default();
+        form.add_reader_file_with_mime("json", bytes, "", mime::APPLICATION_JSON);
+        let response = send_form(&srv, form, "/").await;
+        assert_eq!(response.status(), StatusCode::OK);
     }
 }

actix-multipart/src/form/mod.rs

@@ -1,4 +1,4 @@
-//! Extract and process typed data from fields of a `multipart/form-data` request.
+//! Process and extract typed data from a multipart stream.
 
 use std::{
     any::Any,
@@ -33,14 +33,6 @@ pub trait FieldReader<'t>: Sized + Any {
     type Future: Future<Output = Result<Self, MultipartError>>;
 
     /// The form will call this function to handle the field.
-    ///
-    /// # Panics
-    ///
-    /// When reading the `field` payload using its `Stream` implementation, polling (manually or via
-    /// `next()`/`try_next()`) may panic after the payload is exhausted. If this is a problem for
-    /// your implementation of this method, you should [`fuse()`] the `Field` first.
-    ///
-    /// [`fuse()`]: futures_util::stream::StreamExt::fuse()
     fn read_field(req: &'t HttpRequest, field: Field, limits: &'t mut Limits) -> Self::Future;
 }
 
@@ -80,13 +72,13 @@ where
         state: &'t mut State,
         duplicate_field: DuplicateField,
     ) -> Self::Future {
-        if state.contains_key(&field.form_field_name) {
+        if state.contains_key(field.name()) {
             match duplicate_field {
                 DuplicateField::Ignore => return Box::pin(ready(Ok(()))),
 
                 DuplicateField::Deny => {
                     return Box::pin(ready(Err(MultipartError::DuplicateField(
-                        field.form_field_name,
+                        field.name().to_owned(),
                     ))))
                 }
 
@@ -95,7 +87,7 @@ where
         }
 
         Box::pin(async move {
-            let field_name = field.form_field_name.clone();
+            let field_name = field.name().to_owned();
             let t = T::read_field(req, field, limits).await?;
             state.insert(field_name, Box::new(t));
             Ok(())
@@ -123,8 +115,10 @@ where
         Box::pin(async move {
             // Note: Vec GroupReader always allows duplicates
 
+            let field_name = field.name().to_owned();
+
             let vec = state
-                .entry(field.form_field_name.clone())
+                .entry(field_name)
                 .or_insert_with(|| Box::<Vec<T>>::default())
                 .downcast_mut::<Vec<T>>()
                 .unwrap();
@@ -157,13 +151,13 @@ where
         state: &'t mut State,
         duplicate_field: DuplicateField,
     ) -> Self::Future {
-        if state.contains_key(&field.form_field_name) {
+        if state.contains_key(field.name()) {
             match duplicate_field {
                 DuplicateField::Ignore => return Box::pin(ready(Ok(()))),
 
                 DuplicateField::Deny => {
                     return Box::pin(ready(Err(MultipartError::DuplicateField(
-                        field.form_field_name,
+                        field.name().to_owned(),
                     ))))
                 }
 
@@ -172,7 +166,7 @@ where
         }
 
         Box::pin(async move {
-            let field_name = field.form_field_name.clone();
+            let field_name = field.name().to_owned();
             let t = T::read_field(req, field, limits).await?;
             state.insert(field_name, Box::new(t));
             Ok(())
@@ -279,9 +273,6 @@ impl Limits {
 /// [`MultipartCollect`] trait. You should use the [`macro@MultipartForm`] macro to derive this
 /// for your struct.
 ///
-/// Note that this extractor rejects requests with any other Content-Type such as `multipart/mixed`,
-/// `multipart/related`, or non-multipart media types.
-///
 /// Add a [`MultipartFormConfig`] to your app data to configure extraction.
 #[derive(Deref, DerefMut)]
 pub struct MultipartForm<T: MultipartCollect>(pub T);
@@ -295,24 +286,14 @@ impl<T: MultipartCollect> MultipartForm<T> {
 
 impl<T> FromRequest for MultipartForm<T>
 where
-    T: MultipartCollect + 'static,
+    T: MultipartCollect,
 {
     type Error = Error;
     type Future = LocalBoxFuture<'static, Result<Self, Self::Error>>;
 
     #[inline]
     fn from_request(req: &HttpRequest, payload: &mut dev::Payload) -> Self::Future {
-        let mut multipart = Multipart::from_req(req, payload);
-
-        let content_type = match multipart.content_type_or_bail() {
-            Ok(content_type) => content_type,
-            Err(err) => return Box::pin(ready(Err(err.into()))),
-        };
-
-        if content_type.subtype() != mime::FORM_DATA {
-            // this extractor only supports multipart/form-data
-            return Box::pin(ready(Err(MultipartError::ContentTypeIncompatible.into())));
-        };
+        let mut payload = Multipart::new(req.headers(), payload.take());
 
         let config = MultipartFormConfig::from_req(req);
         let mut limits = Limits::new(config.total_limit, config.memory_limit);
@@ -324,29 +305,21 @@ where
         Box::pin(
             async move {
                 let mut state = State::default();
-
-                // ensure limits are shared for all fields with this name
+                // We need to ensure field limits are shared for all instances of this field name
                 let mut field_limits = HashMap::<String, Option<usize>>::new();
 
-                while let Some(field) = multipart.try_next().await? {
-                    debug_assert!(
-                        !field.form_field_name.is_empty(),
-                        "multipart form fields should have names",
-                    );
-
+                while let Some(field) = payload.try_next().await? {
                     // Retrieve the limit for this field
                     let entry = field_limits
-                        .entry(field.form_field_name.clone())
-                        .or_insert_with(|| T::limit(&field.form_field_name));
-
-                    limits.field_limit_remaining.clone_from(entry);
+                        .entry(field.name().to_owned())
+                        .or_insert_with(|| T::limit(field.name()));
+                    limits.field_limit_remaining = entry.to_owned();
 
                     T::handle_field(&req, field, &mut limits, &mut state).await?;
 
                     // Update the stored limit
                     *entry = limits.field_limit_remaining;
                 }
-
                 let inner = T::from_state(state)?;
                 Ok(MultipartForm(inner))
             }
@@ -422,20 +395,11 @@ mod tests {
     use actix_http::encoding::Decoder;
     use actix_multipart_rfc7578::client::multipart;
     use actix_test::TestServer;
-    use actix_web::{
-        dev::Payload, http::StatusCode, web, App, HttpRequest, HttpResponse, Resource, Responder,
-    };
+    use actix_web::{dev::Payload, http::StatusCode, web, App, HttpResponse, Responder};
     use awc::{Client, ClientResponse};
-    use futures_core::future::LocalBoxFuture;
-    use futures_util::TryStreamExt as _;
 
     use super::MultipartForm;
-    use crate::{
-        form::{
-            bytes::Bytes, tempfile::TempFile, text::Text, FieldReader, Limits, MultipartFormConfig,
-        },
-        Field, MultipartError,
-    };
+    use crate::form::{bytes::Bytes, tempfile::TempFile, text::Text, MultipartFormConfig};
 
     pub async fn send_form(
         srv: &TestServer,
@@ -769,84 +733,4 @@ mod tests {
         let response = send_form(&srv, form, "/").await;
         assert_eq!(response.status(), StatusCode::BAD_REQUEST);
     }
-
-    #[actix_rt::test]
-    async fn non_multipart_form_data() {
-        #[derive(MultipartForm)]
-        struct TestNonMultipartFormData {
-            #[allow(unused)]
-            #[multipart(limit = "30B")]
-            foo: Text<String>,
-        }
-
-        async fn non_multipart_form_data_route(
-            _form: MultipartForm<TestNonMultipartFormData>,
-        ) -> String {
-            unreachable!("request is sent with multipart/mixed");
-        }
-
-        let srv = actix_test::start(|| {
-            App::new().route("/", web::post().to(non_multipart_form_data_route))
-        });
-
-        let mut form = multipart::Form::default();
-        form.add_text("foo", "foo");
-
-        // mangle content-type, keeping the boundary
-        let ct = form.content_type().replacen("/form-data", "/mixed", 1);
-
-        let res = Client::default()
-            .post(srv.url("/"))
-            .content_type(ct)
-            .send_body(multipart::Body::from(form))
-            .await
-            .unwrap();
-
-        assert_eq!(res.status(), StatusCode::UNSUPPORTED_MEDIA_TYPE);
-    }
-
-    #[should_panic(expected = "called `Result::unwrap()` on an `Err` value: Connect(Disconnected)")]
-    #[actix_web::test]
-    async fn field_try_next_panic() {
-        #[derive(Debug)]
-        struct NullSink;
-
-        impl<'t> FieldReader<'t> for NullSink {
-            type Future = LocalBoxFuture<'t, Result<Self, MultipartError>>;
-
-            fn read_field(
-                _: &'t HttpRequest,
-                mut field: Field,
-                _limits: &'t mut Limits,
-            ) -> Self::Future {
-                Box::pin(async move {
-                    // exhaust field stream
-                    while let Some(_chunk) = field.try_next().await? {}
-
-                    // poll again, crash
-                    let _post = field.try_next().await;
-
-                    Ok(Self)
-                })
-            }
-        }
-
-        #[allow(dead_code)]
-        #[derive(MultipartForm)]
-        struct NullSinkForm {
-            foo: NullSink,
-        }
-
-        async fn null_sink(_form: MultipartForm<NullSinkForm>) -> impl Responder {
-            "unreachable"
-        }
-
-        let srv = actix_test::start(|| App::new().service(Resource::new("/").post(null_sink)));
-
-        let mut form = multipart::Form::default();
-        form.add_text("foo", "data is not important to this test");
-
-        // panics with Err(Connect(Disconnected)) due to form NullSink panic
-        let _res = send_form(&srv, form, "/").await;
-    }
 }

actix-multipart/src/form/tempfile.rs

@@ -42,36 +42,38 @@ impl<'t> FieldReader<'t> for TempFile {
     fn read_field(req: &'t HttpRequest, mut field: Field, limits: &'t mut Limits) -> Self::Future {
         Box::pin(async move {
             let config = TempFileConfig::from_req(req);
+            let field_name = field.name().to_owned();
             let mut size = 0;
 
-            let file = config.create_tempfile().map_err(|err| {
-                config.map_error(req, &field.form_field_name, TempFileError::FileIo(err))
-            })?;
+            let file = config
+                .create_tempfile()
+                .map_err(|err| config.map_error(req, &field_name, TempFileError::FileIo(err)))?;
 
-            let mut file_async = tokio::fs::File::from_std(file.reopen().map_err(|err| {
-                config.map_error(req, &field.form_field_name, TempFileError::FileIo(err))
+            let mut file_async =
+                tokio::fs::File::from_std(file.reopen().map_err(|err| {
+                    config.map_error(req, &field_name, TempFileError::FileIo(err))
                 })?);
 
             while let Some(chunk) = field.try_next().await? {
                 limits.try_consume_limits(chunk.len(), false)?;
                 size += chunk.len();
                 file_async.write_all(chunk.as_ref()).await.map_err(|err| {
-                    config.map_error(req, &field.form_field_name, TempFileError::FileIo(err))
+                    config.map_error(req, &field_name, TempFileError::FileIo(err))
                 })?;
             }
 
-            file_async.flush().await.map_err(|err| {
-                config.map_error(req, &field.form_field_name, TempFileError::FileIo(err))
-            })?;
+            file_async
+                .flush()
+                .await
+                .map_err(|err| config.map_error(req, &field_name, TempFileError::FileIo(err)))?;
 
             Ok(TempFile {
                 file,
                 content_type: field.content_type().map(ToOwned::to_owned),
                 file_name: field
                     .content_disposition()
-                    .expect("multipart form fields should have a content-disposition header")
                     .get_filename()
-                    .map(ToOwned::to_owned),
+                    .map(str::to_owned),
                 size,
             })
         })
@@ -82,7 +84,7 @@ impl<'t> FieldReader<'t> for TempFile {
 #[non_exhaustive]
 pub enum TempFileError {
     /// File I/O Error
-    #[display("File I/O error: {}", _0)]
+    #[display(fmt = "File I/O error: {}", _0)]
     FileIo(std::io::Error),
 }
 
@@ -135,7 +137,7 @@ impl TempFileConfig {
         };
 
         MultipartError::Field {
-            name: field_name.to_owned(),
+            field_name: field_name.to_owned(),
             source,
         }
     }

actix-multipart/src/form/text.rs

@@ -36,6 +36,7 @@ where
     fn read_field(req: &'t HttpRequest, field: Field, limits: &'t mut Limits) -> Self::Future {
         Box::pin(async move {
             let config = TextConfig::from_req(req);
+            let field_name = field.name().to_owned();
 
             if config.validate_content_type {
                 let valid = if let Some(mime) = field.content_type() {
@@ -48,24 +49,22 @@ where
 
                 if !valid {
                     return Err(MultipartError::Field {
-                        name: field.form_field_name,
+                        field_name,
                         source: config.map_error(req, TextError::ContentType),
                     });
                 }
             }
 
-            let form_field_name = field.form_field_name.clone();
-
             let bytes = Bytes::read_field(req, field, limits).await?;
 
             let text = str::from_utf8(&bytes.data).map_err(|err| MultipartError::Field {
-                name: form_field_name.clone(),
+                field_name: field_name.clone(),
                 source: config.map_error(req, TextError::Utf8Error(err)),
             })?;
 
             Ok(Text(serde_plain::from_str(text).map_err(|err| {
                 MultipartError::Field {
-                    name: form_field_name,
+                    field_name,
                     source: config.map_error(req, TextError::Deserialize(err)),
                 }
             })?))
@@ -77,15 +76,15 @@ where
 #[non_exhaustive]
 pub enum TextError {
     /// UTF-8 decoding error.
-    #[display("UTF-8 decoding error: {}", _0)]
+    #[display(fmt = "UTF-8 decoding error: {}", _0)]
     Utf8Error(str::Utf8Error),
 
     /// Deserialize error.
-    #[display("Plain text deserialize error: {}", _0)]
+    #[display(fmt = "Plain text deserialize error: {}", _0)]
     Deserialize(serde_plain::Error),
 
     /// Content type error.
-    #[display("Content type error")]
+    #[display(fmt = "Content type error")]
     ContentType,
 }
 

actix-multipart/src/lib.rs

@@ -1,61 +1,8 @@
-//! Multipart request & form support for Actix Web.
-//!
-//! The [`Multipart`] extractor aims to support all kinds of `multipart/*` requests, including
-//! `multipart/form-data`, `multipart/related` and `multipart/mixed`. This is a lower-level
-//! extractor which supports reading [multipart fields](Field), in the order they are sent by the
-//! client.
-//!
-//! Due to additional requirements for `multipart/form-data` requests, the higher level
-//! [`MultipartForm`] extractor and derive macro only supports this media type.
-//!
-//! # Examples
-//!
-//! ```no_run
-//! use actix_web::{post, App, HttpServer, Responder};
-//!
-//! use actix_multipart::form::{json::Json as MpJson, tempfile::TempFile, MultipartForm};
-//! use serde::Deserialize;
-//!
-//! #[derive(Debug, Deserialize)]
-//! struct Metadata {
-//!     name: String,
-//! }
-//!
-//! #[derive(Debug, MultipartForm)]
-//! struct UploadForm {
-//!     #[multipart(limit = "100MB")]
-//!     file: TempFile,
-//!     json: MpJson<Metadata>,
-//! }
-//!
-//! #[post("/videos")]
-//! pub async fn post_video(MultipartForm(form): MultipartForm<UploadForm>) -> impl Responder {
-//!     format!(
-//!         "Uploaded file {}, with size: {}",
-//!         form.json.name, form.file.size
-//!     )
-//! }
-//!
-//! #[actix_web::main]
-//! async fn main() -> std::io::Result<()> {
-//!     HttpServer::new(move || App::new().service(post_video))
-//!         .bind(("127.0.0.1", 8080))?
-//!         .run()
-//!         .await
-//! }
-//! ```
-//!
-//! cURL request:
-//!
-//! ```sh
-//! curl -v --request POST \
-//!   --url http://localhost:8080/videos \
-//!   -F 'json={"name": "Cargo.lock"};type=application/json' \
-//!   -F file=@./Cargo.lock
-//! ```
-//!
-//! [`MultipartForm`]: struct@form::MultipartForm
+//! Multipart form support for Actix Web.
 
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible)]
+#![allow(clippy::borrow_interior_mutable_const)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
@@ -66,15 +13,11 @@ extern crate self as actix_multipart;
 
 mod error;
 mod extractor;
-pub(crate) mod field;
+mod server;
+
 pub mod form;
-mod multipart;
-pub(crate) mod payload;
-pub(crate) mod safety;
-pub mod test;
 
 pub use self::{
-    error::Error as MultipartError,
-    field::{Field, LimitExceeded},
-    multipart::Multipart,
+    error::MultipartError,
+    server::{Field, Multipart},
 };

actix-multipart/src/multipart.rs

@@ -1,883 +0,0 @@
-//! Multipart response payload support.
-
-use std::{
-    cell::RefCell,
-    pin::Pin,
-    rc::Rc,
-    task::{Context, Poll},
-};
-
-use actix_web::{
-    dev,
-    error::{ParseError, PayloadError},
-    http::header::{self, ContentDisposition, HeaderMap, HeaderName, HeaderValue},
-    web::Bytes,
-    HttpRequest,
-};
-use futures_core::stream::Stream;
-use mime::Mime;
-
-use crate::{
-    error::Error,
-    field::InnerField,
-    payload::{PayloadBuffer, PayloadRef},
-    safety::Safety,
-    Field,
-};
-
-const MAX_HEADERS: usize = 32;
-
-/// The server-side implementation of `multipart/form-data` requests.
-///
-/// This will parse the incoming stream into `MultipartItem` instances via its `Stream`
-/// implementation. `MultipartItem::Field` contains multipart field. `MultipartItem::Multipart` is
-/// used for nested multipart streams.
-pub struct Multipart {
-    flow: Flow,
-    safety: Safety,
-}
-
-enum Flow {
-    InFlight(Inner),
-
-    /// Error container is Some until an error is returned out of the flow.
-    Error(Option<Error>),
-}
-
-impl Multipart {
-    /// Creates multipart instance from parts.
-    pub fn new<S>(headers: &HeaderMap, stream: S) -> Self
-    where
-        S: Stream<Item = Result<Bytes, PayloadError>> + 'static,
-    {
-        match Self::find_ct_and_boundary(headers) {
-            Ok((ct, boundary)) => Self::from_ct_and_boundary(ct, boundary, stream),
-            Err(err) => Self::from_error(err),
-        }
-    }
-
-    /// Creates multipart instance from parts.
-    pub(crate) fn from_req(req: &HttpRequest, payload: &mut dev::Payload) -> Self {
-        match Self::find_ct_and_boundary(req.headers()) {
-            Ok((ct, boundary)) => Self::from_ct_and_boundary(ct, boundary, payload.take()),
-            Err(err) => Self::from_error(err),
-        }
-    }
-
-    /// Extract Content-Type and boundary info from headers.
-    pub(crate) fn find_ct_and_boundary(headers: &HeaderMap) -> Result<(Mime, String), Error> {
-        let content_type = headers
-            .get(&header::CONTENT_TYPE)
-            .ok_or(Error::ContentTypeMissing)?
-            .to_str()
-            .ok()
-            .and_then(|content_type| content_type.parse::<Mime>().ok())
-            .ok_or(Error::ContentTypeParse)?;
-
-        if content_type.type_() != mime::MULTIPART {
-            return Err(Error::ContentTypeIncompatible);
-        }
-
-        let boundary = content_type
-            .get_param(mime::BOUNDARY)
-            .ok_or(Error::BoundaryMissing)?
-            .as_str()
-            .to_owned();
-
-        Ok((content_type, boundary))
-    }
-
-    /// Constructs a new multipart reader from given Content-Type, boundary, and stream.
-    pub(crate) fn from_ct_and_boundary<S>(ct: Mime, boundary: String, stream: S) -> Multipart
-    where
-        S: Stream<Item = Result<Bytes, PayloadError>> + 'static,
-    {
-        Multipart {
-            safety: Safety::new(),
-            flow: Flow::InFlight(Inner {
-                payload: PayloadRef::new(PayloadBuffer::new(stream)),
-                content_type: ct,
-                boundary,
-                state: State::FirstBoundary,
-                item: Item::None,
-            }),
-        }
-    }
-
-    /// Constructs a new multipart reader from given `MultipartError`.
-    pub(crate) fn from_error(err: Error) -> Multipart {
-        Multipart {
-            flow: Flow::Error(Some(err)),
-            safety: Safety::new(),
-        }
-    }
-
-    /// Return requests parsed Content-Type or raise the stored error.
-    pub(crate) fn content_type_or_bail(&mut self) -> Result<mime::Mime, Error> {
-        match self.flow {
-            Flow::InFlight(ref inner) => Ok(inner.content_type.clone()),
-            Flow::Error(ref mut err) => Err(err
-                .take()
-                .expect("error should not be taken after it was returned")),
-        }
-    }
-}
-
-impl Stream for Multipart {
-    type Item = Result<Field, Error>;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        let this = self.get_mut();
-
-        match this.flow {
-            Flow::InFlight(ref mut inner) => {
-                if let Some(mut buffer) = inner.payload.get_mut(&this.safety) {
-                    // check safety and poll read payload to buffer.
-                    buffer.poll_stream(cx)?;
-                } else if !this.safety.is_clean() {
-                    // safety violation
-                    return Poll::Ready(Some(Err(Error::NotConsumed)));
-                } else {
-                    return Poll::Pending;
-                }
-
-                inner.poll(&this.safety, cx)
-            }
-
-            Flow::Error(ref mut err) => Poll::Ready(Some(Err(err
-                .take()
-                .expect("Multipart polled after finish")))),
-        }
-    }
-}
-
-#[derive(PartialEq, Debug)]
-enum State {
-    /// Skip data until first boundary.
-    FirstBoundary,
-
-    /// Reading boundary.
-    Boundary,
-
-    /// Reading Headers.
-    Headers,
-
-    /// Stream EOF.
-    Eof,
-}
-
-enum Item {
-    None,
-    Field(Rc<RefCell<InnerField>>),
-}
-
-struct Inner {
-    /// Request's payload stream & buffer.
-    payload: PayloadRef,
-
-    /// Request's Content-Type.
-    ///
-    /// Guaranteed to have "multipart" top-level media type, i.e., `multipart/*`.
-    content_type: Mime,
-
-    /// Field boundary.
-    boundary: String,
-
-    state: State,
-    item: Item,
-}
-
-impl Inner {
-    fn read_field_headers(payload: &mut PayloadBuffer) -> Result<Option<HeaderMap>, Error> {
-        match payload.read_until(b"\r\n\r\n")? {
-            None => {
-                if payload.eof {
-                    Err(Error::Incomplete)
-                } else {
-                    Ok(None)
-                }
-            }
-
-            Some(bytes) => {
-                let mut hdrs = [httparse::EMPTY_HEADER; MAX_HEADERS];
-
-                match httparse::parse_headers(&bytes, &mut hdrs).map_err(ParseError::from)? {
-                    httparse::Status::Complete((_, hdrs)) => {
-                        // convert headers
-                        let mut headers = HeaderMap::with_capacity(hdrs.len());
-
-                        for h in hdrs {
-                            let name =
-                                HeaderName::try_from(h.name).map_err(|_| ParseError::Header)?;
-                            let value =
-                                HeaderValue::try_from(h.value).map_err(|_| ParseError::Header)?;
-                            headers.append(name, value);
-                        }
-
-                        Ok(Some(headers))
-                    }
-
-                    httparse::Status::Partial => Err(ParseError::Header.into()),
-                }
-            }
-        }
-    }
-
-    /// Reads a field boundary from the payload buffer (and discards it).
-    ///
-    /// Reads "in-between" and "final" boundaries. E.g. for boundary = "foo":
-    ///
-    /// ```plain
-    /// --foo    <-- in-between fields
-    /// --foo--  <-- end of request body, should be followed by EOF
-    /// ```
-    ///
-    /// Returns:
-    ///
-    /// - `Ok(Some(true))` - final field boundary read (EOF)
-    /// - `Ok(Some(false))` - field boundary read
-    /// - `Ok(None)` - boundary not found, more data needs reading
-    /// - `Err(BoundaryMissing)` - multipart boundary is missing
-    fn read_boundary(payload: &mut PayloadBuffer, boundary: &str) -> Result<Option<bool>, Error> {
-        // TODO: need to read epilogue
-        let chunk = match payload.readline_or_eof()? {
-            // TODO: this might be okay as a let Some() else return Ok(None)
-            None => return Ok(payload.eof.then_some(true)),
-            Some(chunk) => chunk,
-        };
-
-        const BOUNDARY_MARKER: &[u8] = b"--";
-        const LINE_BREAK: &[u8] = b"\r\n";
-
-        let boundary_len = boundary.len();
-
-        if chunk.len() < boundary_len + 2 + 2
-            || !chunk.starts_with(BOUNDARY_MARKER)
-            || &chunk[2..boundary_len + 2] != boundary.as_bytes()
-        {
-            return Err(Error::BoundaryMissing);
-        }
-
-        // chunk facts:
-        // - long enough to contain boundary + 2 markers or 1 marker and line-break
-        // - starts with boundary marker
-        // - chunk contains correct boundary
-
-        if &chunk[boundary_len + 2..] == LINE_BREAK {
-            // boundary is followed by line-break, indicating more fields to come
-            return Ok(Some(false));
-        }
-
-        // boundary is followed by marker
-        if &chunk[boundary_len + 2..boundary_len + 4] == BOUNDARY_MARKER
-            && (
-                // chunk is exactly boundary len + 2 markers
-                chunk.len() == boundary_len + 2 + 2
-                // final boundary is allowed to end with a line-break
-                || &chunk[boundary_len + 4..] == LINE_BREAK
-            )
-        {
-            return Ok(Some(true));
-        }
-
-        Err(Error::BoundaryMissing)
-    }
-
-    fn skip_until_boundary(
-        payload: &mut PayloadBuffer,
-        boundary: &str,
-    ) -> Result<Option<bool>, Error> {
-        let mut eof = false;
-
-        loop {
-            match payload.readline()? {
-                Some(chunk) => {
-                    if chunk.is_empty() {
-                        return Err(Error::BoundaryMissing);
-                    }
-                    if chunk.len() < boundary.len() {
-                        continue;
-                    }
-                    if &chunk[..2] == b"--" && &chunk[2..chunk.len() - 2] == boundary.as_bytes() {
-                        break;
-                    } else {
-                        if chunk.len() < boundary.len() + 2 {
-                            continue;
-                        }
-                        let b: &[u8] = boundary.as_ref();
-                        if &chunk[..boundary.len()] == b
-                            && &chunk[boundary.len()..boundary.len() + 2] == b"--"
-                        {
-                            eof = true;
-                            break;
-                        }
-                    }
-                }
-                None => {
-                    return if payload.eof {
-                        Err(Error::Incomplete)
-                    } else {
-                        Ok(None)
-                    };
-                }
-            }
-        }
-        Ok(Some(eof))
-    }
-
-    fn poll(&mut self, safety: &Safety, cx: &Context<'_>) -> Poll<Option<Result<Field, Error>>> {
-        if self.state == State::Eof {
-            Poll::Ready(None)
-        } else {
-            // release field
-            loop {
-                // Nested multipart streams of fields has to be consumed
-                // before switching to next
-                if safety.current() {
-                    let stop = match self.item {
-                        Item::Field(ref mut field) => match field.borrow_mut().poll(safety) {
-                            Poll::Pending => return Poll::Pending,
-                            Poll::Ready(Some(Ok(_))) => continue,
-                            Poll::Ready(Some(Err(err))) => return Poll::Ready(Some(Err(err))),
-                            Poll::Ready(None) => true,
-                        },
-                        Item::None => false,
-                    };
-                    if stop {
-                        self.item = Item::None;
-                    }
-                    if let Item::None = self.item {
-                        break;
-                    }
-                }
-            }
-
-            let field_headers = if let Some(mut payload) = self.payload.get_mut(safety) {
-                match self.state {
-                    // read until first boundary
-                    State::FirstBoundary => {
-                        match Inner::skip_until_boundary(&mut payload, &self.boundary)? {
-                            None => return Poll::Pending,
-                            Some(eof) => {
-                                if eof {
-                                    self.state = State::Eof;
-                                    return Poll::Ready(None);
-                                } else {
-                                    self.state = State::Headers;
-                                }
-                            }
-                        }
-                    }
-
-                    // read boundary
-                    State::Boundary => match Inner::read_boundary(&mut payload, &self.boundary)? {
-                        None => return Poll::Pending,
-                        Some(eof) => {
-                            if eof {
-                                self.state = State::Eof;
-                                return Poll::Ready(None);
-                            } else {
-                                self.state = State::Headers;
-                            }
-                        }
-                    },
-
-                    _ => {}
-                }
-
-                // read field headers for next field
-                if self.state == State::Headers {
-                    if let Some(headers) = Inner::read_field_headers(&mut payload)? {
-                        self.state = State::Boundary;
-                        headers
-                    } else {
-                        return Poll::Pending;
-                    }
-                } else {
-                    unreachable!()
-                }
-            } else {
-                log::debug!("NotReady: field is in flight");
-                return Poll::Pending;
-            };
-
-            let field_content_disposition = field_headers
-                .get(&header::CONTENT_DISPOSITION)
-                .and_then(|cd| ContentDisposition::from_raw(cd).ok())
-                .filter(|content_disposition| {
-                    matches!(
-                        content_disposition.disposition,
-                        header::DispositionType::FormData,
-                    )
-                });
-
-            let form_field_name = if self.content_type.subtype() == mime::FORM_DATA {
-                // According to RFC 7578 §4.2, which relates to "multipart/form-data" requests
-                // specifically, fields must have a Content-Disposition header, its disposition
-                // type must be set as "form-data", and it must have a name parameter.
-
-                let Some(cd) = &field_content_disposition else {
-                    return Poll::Ready(Some(Err(Error::ContentDispositionMissing)));
-                };
-
-                let Some(field_name) = cd.get_name() else {
-                    return Poll::Ready(Some(Err(Error::ContentDispositionNameMissing)));
-                };
-
-                Some(field_name.to_owned())
-            } else {
-                None
-            };
-
-            // TODO: check out other multipart/* RFCs for specific requirements
-
-            let field_content_type: Option<Mime> = field_headers
-                .get(&header::CONTENT_TYPE)
-                .and_then(|ct| ct.to_str().ok())
-                .and_then(|ct| ct.parse().ok());
-
-            self.state = State::Boundary;
-
-            // nested multipart stream is not supported
-            if let Some(mime) = &field_content_type {
-                if mime.type_() == mime::MULTIPART {
-                    return Poll::Ready(Some(Err(Error::Nested)));
-                }
-            }
-
-            let field_inner =
-                InnerField::new_in_rc(self.payload.clone(), self.boundary.clone(), &field_headers)?;
-
-            self.item = Item::Field(Rc::clone(&field_inner));
-
-            Poll::Ready(Some(Ok(Field::new(
-                field_content_type,
-                field_content_disposition,
-                form_field_name,
-                field_headers,
-                safety.clone(cx),
-                field_inner,
-            ))))
-        }
-    }
-}
-
-impl Drop for Inner {
-    fn drop(&mut self) {
-        // InnerMultipartItem::Field has to be dropped first because of Safety.
-        self.item = Item::None;
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::time::Duration;
-
-    use actix_http::h1;
-    use actix_web::{
-        http::header::{DispositionParam, DispositionType},
-        rt,
-        test::TestRequest,
-        web::{BufMut as _, BytesMut},
-        FromRequest,
-    };
-    use assert_matches::assert_matches;
-    use futures_test::stream::StreamTestExt as _;
-    use futures_util::{stream, StreamExt as _};
-    use tokio::sync::mpsc;
-    use tokio_stream::wrappers::UnboundedReceiverStream;
-
-    use super::*;
-
-    const BOUNDARY: &str = "abbc761f78ff4d7cb7573b5a23f96ef0";
-
-    #[actix_rt::test]
-    async fn test_boundary() {
-        let headers = HeaderMap::new();
-        match Multipart::find_ct_and_boundary(&headers) {
-            Err(Error::ContentTypeMissing) => {}
-            _ => unreachable!("should not happen"),
-        }
-
-        let mut headers = HeaderMap::new();
-        headers.insert(
-            header::CONTENT_TYPE,
-            header::HeaderValue::from_static("test"),
-        );
-
-        match Multipart::find_ct_and_boundary(&headers) {
-            Err(Error::ContentTypeParse) => {}
-            _ => unreachable!("should not happen"),
-        }
-
-        let mut headers = HeaderMap::new();
-        headers.insert(
-            header::CONTENT_TYPE,
-            header::HeaderValue::from_static("multipart/mixed"),
-        );
-        match Multipart::find_ct_and_boundary(&headers) {
-            Err(Error::BoundaryMissing) => {}
-            _ => unreachable!("should not happen"),
-        }
-
-        let mut headers = HeaderMap::new();
-        headers.insert(
-            header::CONTENT_TYPE,
-            header::HeaderValue::from_static(
-                "multipart/mixed; boundary=\"5c02368e880e436dab70ed54e1c58209\"",
-            ),
-        );
-
-        assert_eq!(
-            Multipart::find_ct_and_boundary(&headers).unwrap().1,
-            "5c02368e880e436dab70ed54e1c58209",
-        );
-    }
-
-    fn create_stream() -> (
-        mpsc::UnboundedSender<Result<Bytes, PayloadError>>,
-        impl Stream<Item = Result<Bytes, PayloadError>>,
-    ) {
-        let (tx, rx) = mpsc::unbounded_channel();
-
-        (
-            tx,
-            UnboundedReceiverStream::new(rx).map(|res| res.map_err(|_| panic!())),
-        )
-    }
-
-    fn create_simple_request_with_header() -> (Bytes, HeaderMap) {
-        let (body, headers) = crate::test::create_form_data_payload_and_headers_with_boundary(
-            BOUNDARY,
-            "file",
-            Some("fn.txt".to_owned()),
-            Some(mime::TEXT_PLAIN_UTF_8),
-            Bytes::from_static(b"data"),
-        );
-
-        let mut buf = BytesMut::with_capacity(body.len() + 14);
-
-        // add junk before form to test pre-boundary data rejection
-        buf.put("testasdadsad\r\n".as_bytes());
-
-        buf.put(body);
-
-        (buf.freeze(), headers)
-    }
-
-    // TODO: use test utility when multi-file support is introduced
-    fn create_double_request_with_header() -> (Bytes, HeaderMap) {
-        let bytes = Bytes::from(
-            "testasdadsad\r\n\
-             --abbc761f78ff4d7cb7573b5a23f96ef0\r\n\
-             Content-Disposition: form-data; name=\"file\"; filename=\"fn.txt\"\r\n\
-             Content-Type: text/plain; charset=utf-8\r\nContent-Length: 4\r\n\r\n\
-             test\r\n\
-             --abbc761f78ff4d7cb7573b5a23f96ef0\r\n\
-             Content-Disposition: form-data; name=\"file\"; filename=\"fn.txt\"\r\n\
-             Content-Type: text/plain; charset=utf-8\r\nContent-Length: 4\r\n\r\n\
-             data\r\n\
-             --abbc761f78ff4d7cb7573b5a23f96ef0--\r\n",
-        );
-        let mut headers = HeaderMap::new();
-        headers.insert(
-            header::CONTENT_TYPE,
-            header::HeaderValue::from_static(
-                "multipart/mixed; boundary=\"abbc761f78ff4d7cb7573b5a23f96ef0\"",
-            ),
-        );
-        (bytes, headers)
-    }
-
-    #[actix_rt::test]
-    async fn test_multipart_no_end_crlf() {
-        let (sender, payload) = create_stream();
-        let (mut bytes, headers) = create_double_request_with_header();
-        let bytes_stripped = bytes.split_to(bytes.len()); // strip crlf
-
-        sender.send(Ok(bytes_stripped)).unwrap();
-        drop(sender); // eof
-
-        let mut multipart = Multipart::new(&headers, payload);
-
-        match multipart.next().await.unwrap() {
-            Ok(_) => {}
-            _ => unreachable!(),
-        }
-
-        match multipart.next().await.unwrap() {
-            Ok(_) => {}
-            _ => unreachable!(),
-        }
-
-        match multipart.next().await {
-            None => {}
-            _ => unreachable!(),
-        }
-    }
-
-    #[actix_rt::test]
-    async fn test_multipart() {
-        let (sender, payload) = create_stream();
-        let (bytes, headers) = create_double_request_with_header();
-
-        sender.send(Ok(bytes)).unwrap();
-
-        let mut multipart = Multipart::new(&headers, payload);
-        match multipart.next().await {
-            Some(Ok(mut field)) => {
-                let cd = field.content_disposition().unwrap();
-                assert_eq!(cd.disposition, DispositionType::FormData);
-                assert_eq!(cd.parameters[0], DispositionParam::Name("file".into()));
-
-                assert_eq!(field.content_type().unwrap().type_(), mime::TEXT);
-                assert_eq!(field.content_type().unwrap().subtype(), mime::PLAIN);
-
-                match field.next().await.unwrap() {
-                    Ok(chunk) => assert_eq!(chunk, "test"),
-                    _ => unreachable!(),
-                }
-                match field.next().await {
-                    None => {}
-                    _ => unreachable!(),
-                }
-            }
-            _ => unreachable!(),
-        }
-
-        match multipart.next().await.unwrap() {
-            Ok(mut field) => {
-                assert_eq!(field.content_type().unwrap().type_(), mime::TEXT);
-                assert_eq!(field.content_type().unwrap().subtype(), mime::PLAIN);
-
-                match field.next().await {
-                    Some(Ok(chunk)) => assert_eq!(chunk, "data"),
-                    _ => unreachable!(),
-                }
-                match field.next().await {
-                    None => {}
-                    _ => unreachable!(),
-                }
-            }
-            _ => unreachable!(),
-        }
-
-        match multipart.next().await {
-            None => {}
-            _ => unreachable!(),
-        }
-    }
-
-    // Loops, collecting all bytes until end-of-field
-    async fn get_whole_field(field: &mut Field) -> BytesMut {
-        let mut b = BytesMut::new();
-        loop {
-            match field.next().await {
-                Some(Ok(chunk)) => b.extend_from_slice(&chunk),
-                None => return b,
-                _ => unreachable!(),
-            }
-        }
-    }
-
-    #[actix_rt::test]
-    async fn test_stream() {
-        let (bytes, headers) = create_double_request_with_header();
-        let payload = stream::iter(bytes)
-            .map(|byte| Ok(Bytes::copy_from_slice(&[byte])))
-            .interleave_pending();
-
-        let mut multipart = Multipart::new(&headers, payload);
-        match multipart.next().await.unwrap() {
-            Ok(mut field) => {
-                let cd = field.content_disposition().unwrap();
-                assert_eq!(cd.disposition, DispositionType::FormData);
-                assert_eq!(cd.parameters[0], DispositionParam::Name("file".into()));
-
-                assert_eq!(field.content_type().unwrap().type_(), mime::TEXT);
-                assert_eq!(field.content_type().unwrap().subtype(), mime::PLAIN);
-
-                assert_eq!(get_whole_field(&mut field).await, "test");
-            }
-            _ => unreachable!(),
-        }
-
-        match multipart.next().await {
-            Some(Ok(mut field)) => {
-                assert_eq!(field.content_type().unwrap().type_(), mime::TEXT);
-                assert_eq!(field.content_type().unwrap().subtype(), mime::PLAIN);
-
-                assert_eq!(get_whole_field(&mut field).await, "data");
-            }
-            _ => unreachable!(),
-        }
-
-        match multipart.next().await {
-            None => {}
-            _ => unreachable!(),
-        }
-    }
-
-    #[actix_rt::test]
-    async fn test_multipart_from_error() {
-        let err = Error::ContentTypeMissing;
-        let mut multipart = Multipart::from_error(err);
-        assert!(multipart.next().await.unwrap().is_err())
-    }
-
-    #[actix_rt::test]
-    async fn test_multipart_from_boundary() {
-        let (_, payload) = create_stream();
-        let (_, headers) = create_simple_request_with_header();
-        let (ct, boundary) = Multipart::find_ct_and_boundary(&headers).unwrap();
-        let _ = Multipart::from_ct_and_boundary(ct, boundary, payload);
-    }
-
-    #[actix_rt::test]
-    async fn test_multipart_payload_consumption() {
-        // with sample payload and HttpRequest with no headers
-        let (_, inner_payload) = h1::Payload::create(false);
-        let mut payload = actix_web::dev::Payload::from(inner_payload);
-        let req = TestRequest::default().to_http_request();
-
-        // multipart should generate an error
-        let mut mp = Multipart::from_request(&req, &mut payload).await.unwrap();
-        assert!(mp.next().await.unwrap().is_err());
-
-        // and should not consume the payload
-        match payload {
-            actix_web::dev::Payload::H1 { .. } => {} //expected
-            _ => unreachable!(),
-        }
-    }
-
-    #[actix_rt::test]
-    async fn no_content_disposition_form_data() {
-        let bytes = Bytes::from(
-            "testasdadsad\r\n\
-             --abbc761f78ff4d7cb7573b5a23f96ef0\r\n\
-             Content-Type: text/plain; charset=utf-8\r\n\
-             Content-Length: 4\r\n\
-             \r\n\
-             test\r\n\
-             --abbc761f78ff4d7cb7573b5a23f96ef0\r\n",
-        );
-        let mut headers = HeaderMap::new();
-        headers.insert(
-            header::CONTENT_TYPE,
-            header::HeaderValue::from_static(
-                "multipart/form-data; boundary=\"abbc761f78ff4d7cb7573b5a23f96ef0\"",
-            ),
-        );
-        let payload = stream::iter(bytes)
-            .map(|byte| Ok(Bytes::copy_from_slice(&[byte])))
-            .interleave_pending();
-
-        let mut multipart = Multipart::new(&headers, payload);
-        let res = multipart.next().await.unwrap();
-        assert_matches!(
-            res.expect_err(
-                "according to RFC 7578, form-data fields require a content-disposition header"
-            ),
-            Error::ContentDispositionMissing
-        );
-    }
-
-    #[actix_rt::test]
-    async fn no_content_disposition_non_form_data() {
-        let bytes = Bytes::from(
-            "testasdadsad\r\n\
-             --abbc761f78ff4d7cb7573b5a23f96ef0\r\n\
-             Content-Type: text/plain; charset=utf-8\r\n\
-             Content-Length: 4\r\n\
-             \r\n\
-             test\r\n\
-             --abbc761f78ff4d7cb7573b5a23f96ef0\r\n",
-        );
-        let mut headers = HeaderMap::new();
-        headers.insert(
-            header::CONTENT_TYPE,
-            header::HeaderValue::from_static(
-                "multipart/mixed; boundary=\"abbc761f78ff4d7cb7573b5a23f96ef0\"",
-            ),
-        );
-        let payload = stream::iter(bytes)
-            .map(|byte| Ok(Bytes::copy_from_slice(&[byte])))
-            .interleave_pending();
-
-        let mut multipart = Multipart::new(&headers, payload);
-        let res = multipart.next().await.unwrap();
-        res.unwrap();
-    }
-
-    #[actix_rt::test]
-    async fn no_name_in_form_data_content_disposition() {
-        let bytes = Bytes::from(
-            "testasdadsad\r\n\
-             --abbc761f78ff4d7cb7573b5a23f96ef0\r\n\
-             Content-Disposition: form-data; filename=\"fn.txt\"\r\n\
-             Content-Type: text/plain; charset=utf-8\r\n\
-             Content-Length: 4\r\n\
-             \r\n\
-             test\r\n\
-             --abbc761f78ff4d7cb7573b5a23f96ef0\r\n",
-        );
-        let mut headers = HeaderMap::new();
-        headers.insert(
-            header::CONTENT_TYPE,
-            header::HeaderValue::from_static(
-                "multipart/form-data; boundary=\"abbc761f78ff4d7cb7573b5a23f96ef0\"",
-            ),
-        );
-        let payload = stream::iter(bytes)
-            .map(|byte| Ok(Bytes::copy_from_slice(&[byte])))
-            .interleave_pending();
-
-        let mut multipart = Multipart::new(&headers, payload);
-        let res = multipart.next().await.unwrap();
-        assert_matches!(
-            res.expect_err("according to RFC 7578, form-data fields require a name attribute"),
-            Error::ContentDispositionNameMissing
-        );
-    }
-
-    #[actix_rt::test]
-    async fn test_drop_multipart_dont_hang() {
-        let (sender, payload) = create_stream();
-        let (bytes, headers) = create_simple_request_with_header();
-        sender.send(Ok(bytes)).unwrap();
-        drop(sender); // eof
-
-        let mut multipart = Multipart::new(&headers, payload);
-        let mut field = multipart.next().await.unwrap().unwrap();
-
-        drop(multipart);
-
-        // should fail immediately
-        match field.next().await {
-            Some(Err(Error::NotConsumed)) => {}
-            _ => panic!(),
-        };
-    }
-
-    #[actix_rt::test]
-    async fn test_drop_field_awaken_multipart() {
-        let (sender, payload) = create_stream();
-        let (bytes, headers) = create_double_request_with_header();
-        sender.send(Ok(bytes)).unwrap();
-        drop(sender); // eof
-
-        let mut multipart = Multipart::new(&headers, payload);
-        let mut field = multipart.next().await.unwrap().unwrap();
-
-        let task = rt::spawn(async move {
-            rt::time::sleep(Duration::from_millis(500)).await;
-            assert_eq!(field.next().await.unwrap().unwrap(), "test");
-            drop(field);
-        });
-
-        // dropping field should awaken current task
-        let _ = multipart.next().await.unwrap().unwrap();
-        task.await.unwrap();
-    }
-}

actix-multipart/src/payload.rs

@@ -1,255 +0,0 @@
-use std::{
-    cell::{RefCell, RefMut},
-    cmp, mem,
-    pin::Pin,
-    rc::Rc,
-    task::{Context, Poll},
-};
-
-use actix_web::{
-    error::PayloadError,
-    web::{Bytes, BytesMut},
-};
-use futures_core::stream::{LocalBoxStream, Stream};
-
-use crate::{error::Error, safety::Safety};
-
-pub(crate) struct PayloadRef {
-    payload: Rc<RefCell<PayloadBuffer>>,
-}
-
-impl PayloadRef {
-    pub(crate) fn new(payload: PayloadBuffer) -> PayloadRef {
-        PayloadRef {
-            payload: Rc::new(RefCell::new(payload)),
-        }
-    }
-
-    pub(crate) fn get_mut(&self, safety: &Safety) -> Option<RefMut<'_, PayloadBuffer>> {
-        if safety.current() {
-            Some(self.payload.borrow_mut())
-        } else {
-            None
-        }
-    }
-}
-
-impl Clone for PayloadRef {
-    fn clone(&self) -> PayloadRef {
-        PayloadRef {
-            payload: Rc::clone(&self.payload),
-        }
-    }
-}
-
-/// Payload buffer.
-pub(crate) struct PayloadBuffer {
-    pub(crate) stream: LocalBoxStream<'static, Result<Bytes, PayloadError>>,
-    pub(crate) buf: BytesMut,
-    /// EOF flag. If true, no more payload reads will be attempted.
-    pub(crate) eof: bool,
-}
-
-impl PayloadBuffer {
-    /// Constructs new payload buffer.
-    pub(crate) fn new<S>(stream: S) -> Self
-    where
-        S: Stream<Item = Result<Bytes, PayloadError>> + 'static,
-    {
-        PayloadBuffer {
-            stream: Box::pin(stream),
-            buf: BytesMut::with_capacity(1_024), // pre-allocate 1KiB
-            eof: false,
-        }
-    }
-
-    pub(crate) fn poll_stream(&mut self, cx: &mut Context<'_>) -> Result<(), PayloadError> {
-        loop {
-            match Pin::new(&mut self.stream).poll_next(cx) {
-                Poll::Ready(Some(Ok(data))) => {
-                    self.buf.extend_from_slice(&data);
-                    // try to read more data
-                    continue;
-                }
-                Poll::Ready(Some(Err(err))) => return Err(err),
-                Poll::Ready(None) => {
-                    self.eof = true;
-                    return Ok(());
-                }
-                Poll::Pending => return Ok(()),
-            }
-        }
-    }
-
-    /// Reads exact number of bytes.
-    #[cfg(test)]
-    pub(crate) fn read_exact(&mut self, size: usize) -> Option<Bytes> {
-        if size <= self.buf.len() {
-            Some(self.buf.split_to(size).freeze())
-        } else {
-            None
-        }
-    }
-
-    pub(crate) fn read_max(&mut self, size: u64) -> Result<Option<Bytes>, Error> {
-        if !self.buf.is_empty() {
-            let size = cmp::min(self.buf.len() as u64, size) as usize;
-            Ok(Some(self.buf.split_to(size).freeze()))
-        } else if self.eof {
-            Err(Error::Incomplete)
-        } else {
-            Ok(None)
-        }
-    }
-
-    /// Reads until specified ending.
-    ///
-    /// Returns:
-    ///
-    /// - `Ok(Some(chunk))` - `needle` is found, with chunk ending after needle
-    /// - `Err(Incomplete)` - `needle` is not found and we're at EOF
-    /// - `Ok(None)` - `needle` is not found otherwise
-    pub(crate) fn read_until(&mut self, needle: &[u8]) -> Result<Option<Bytes>, Error> {
-        match memchr::memmem::find(&self.buf, needle) {
-            // buffer exhausted and EOF without finding needle
-            None if self.eof => Err(Error::Incomplete),
-
-            // needle not yet found
-            None => Ok(None),
-
-            // needle found, split chunk out of buf
-            Some(idx) => Ok(Some(self.buf.split_to(idx + needle.len()).freeze())),
-        }
-    }
-
-    /// Reads bytes until new line delimiter (`\n`, `0x0A`).
-    ///
-    /// Returns:
-    ///
-    /// - `Ok(Some(chunk))` - `needle` is found, with chunk ending after needle
-    /// - `Err(Incomplete)` - `needle` is not found and we're at EOF
-    /// - `Ok(None)` - `needle` is not found otherwise
-    #[inline]
-    pub(crate) fn readline(&mut self) -> Result<Option<Bytes>, Error> {
-        self.read_until(b"\n")
-    }
-
-    /// Reads bytes until new line delimiter or until EOF.
-    #[inline]
-    pub(crate) fn readline_or_eof(&mut self) -> Result<Option<Bytes>, Error> {
-        match self.readline() {
-            Err(Error::Incomplete) if self.eof => Ok(Some(self.buf.split().freeze())),
-            line => line,
-        }
-    }
-
-    /// Puts unprocessed data back to the buffer.
-    pub(crate) fn unprocessed(&mut self, data: Bytes) {
-        // TODO: use BytesMut::from when it's released, see https://github.com/tokio-rs/bytes/pull/710
-        let buf = BytesMut::from(&data[..]);
-        let buf = mem::replace(&mut self.buf, buf);
-        self.buf.extend_from_slice(&buf);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use actix_http::h1;
-    use futures_util::future::lazy;
-
-    use super::*;
-
-    #[actix_rt::test]
-    async fn basic() {
-        let (_, payload) = h1::Payload::create(false);
-        let mut payload = PayloadBuffer::new(payload);
-
-        assert_eq!(payload.buf.len(), 0);
-        lazy(|cx| payload.poll_stream(cx)).await.unwrap();
-        assert_eq!(None, payload.read_max(1).unwrap());
-    }
-
-    #[actix_rt::test]
-    async fn eof() {
-        let (mut sender, payload) = h1::Payload::create(false);
-        let mut payload = PayloadBuffer::new(payload);
-
-        assert_eq!(None, payload.read_max(4).unwrap());
-        sender.feed_data(Bytes::from("data"));
-        sender.feed_eof();
-        lazy(|cx| payload.poll_stream(cx)).await.unwrap();
-
-        assert_eq!(Some(Bytes::from("data")), payload.read_max(4).unwrap());
-        assert_eq!(payload.buf.len(), 0);
-        assert!(payload.read_max(1).is_err());
-        assert!(payload.eof);
-    }
-
-    #[actix_rt::test]
-    async fn err() {
-        let (mut sender, payload) = h1::Payload::create(false);
-        let mut payload = PayloadBuffer::new(payload);
-        assert_eq!(None, payload.read_max(1).unwrap());
-        sender.set_error(PayloadError::Incomplete(None));
-        lazy(|cx| payload.poll_stream(cx)).await.err().unwrap();
-    }
-
-    #[actix_rt::test]
-    async fn read_max() {
-        let (mut sender, payload) = h1::Payload::create(false);
-        let mut payload = PayloadBuffer::new(payload);
-
-        sender.feed_data(Bytes::from("line1"));
-        sender.feed_data(Bytes::from("line2"));
-        lazy(|cx| payload.poll_stream(cx)).await.unwrap();
-        assert_eq!(payload.buf.len(), 10);
-
-        assert_eq!(Some(Bytes::from("line1")), payload.read_max(5).unwrap());
-        assert_eq!(payload.buf.len(), 5);
-
-        assert_eq!(Some(Bytes::from("line2")), payload.read_max(5).unwrap());
-        assert_eq!(payload.buf.len(), 0);
-    }
-
-    #[actix_rt::test]
-    async fn read_exactly() {
-        let (mut sender, payload) = h1::Payload::create(false);
-        let mut payload = PayloadBuffer::new(payload);
-
-        assert_eq!(None, payload.read_exact(2));
-
-        sender.feed_data(Bytes::from("line1"));
-        sender.feed_data(Bytes::from("line2"));
-        lazy(|cx| payload.poll_stream(cx)).await.unwrap();
-
-        assert_eq!(Some(Bytes::from_static(b"li")), payload.read_exact(2));
-        assert_eq!(payload.buf.len(), 8);
-
-        assert_eq!(Some(Bytes::from_static(b"ne1l")), payload.read_exact(4));
-        assert_eq!(payload.buf.len(), 4);
-    }
-
-    #[actix_rt::test]
-    async fn read_until() {
-        let (mut sender, payload) = h1::Payload::create(false);
-        let mut payload = PayloadBuffer::new(payload);
-
-        assert_eq!(None, payload.read_until(b"ne").unwrap());
-
-        sender.feed_data(Bytes::from("line1"));
-        sender.feed_data(Bytes::from("line2"));
-        lazy(|cx| payload.poll_stream(cx)).await.unwrap();
-
-        assert_eq!(
-            Some(Bytes::from("line")),
-            payload.read_until(b"ne").unwrap()
-        );
-        assert_eq!(payload.buf.len(), 6);
-
-        assert_eq!(
-            Some(Bytes::from("1line2")),
-            payload.read_until(b"2").unwrap()
-        );
-        assert_eq!(payload.buf.len(), 0);
-    }
-}

actix-multipart/src/safety.rs

@@ -1,60 +0,0 @@
-use std::{cell::Cell, marker::PhantomData, rc::Rc, task};
-
-use local_waker::LocalWaker;
-
-/// Counter. It tracks of number of clones of payloads and give access to payload only to top most.
-///
-/// - When dropped, parent task is awakened. This is to support the case where `Field` is dropped in
-///   a separate task than `Multipart`.
-/// - Assumes that parent owners don't move to different tasks; only the top-most is allowed to.
-/// - If dropped and is not top most owner, is_clean flag is set to false.
-#[derive(Debug)]
-pub(crate) struct Safety {
-    task: LocalWaker,
-    level: usize,
-    payload: Rc<PhantomData<bool>>,
-    clean: Rc<Cell<bool>>,
-}
-
-impl Safety {
-    pub(crate) fn new() -> Safety {
-        let payload = Rc::new(PhantomData);
-        Safety {
-            task: LocalWaker::new(),
-            level: Rc::strong_count(&payload),
-            clean: Rc::new(Cell::new(true)),
-            payload,
-        }
-    }
-
-    pub(crate) fn current(&self) -> bool {
-        Rc::strong_count(&self.payload) == self.level && self.clean.get()
-    }
-
-    pub(crate) fn is_clean(&self) -> bool {
-        self.clean.get()
-    }
-
-    pub(crate) fn clone(&self, cx: &task::Context<'_>) -> Safety {
-        let payload = Rc::clone(&self.payload);
-        let s = Safety {
-            task: LocalWaker::new(),
-            level: Rc::strong_count(&payload),
-            clean: self.clean.clone(),
-            payload,
-        };
-        s.task.register(cx.waker());
-        s
-    }
-}
-
-impl Drop for Safety {
-    fn drop(&mut self) {
-        if Rc::strong_count(&self.payload) != self.level {
-            // Multipart dropped leaving a Field
-            self.clean.set(false);
-        }
-
-        self.task.wake();
-    }
-}

actix-multipart/src/test.rs

@@ -1,217 +0,0 @@
-//! Multipart testing utilities.
-
-use actix_web::{
-    http::header::{self, HeaderMap},
-    web::{BufMut as _, Bytes, BytesMut},
-};
-use mime::Mime;
-use rand::distr::{Alphanumeric, SampleString as _};
-
-const CRLF: &[u8] = b"\r\n";
-const CRLF_CRLF: &[u8] = b"\r\n\r\n";
-const HYPHENS: &[u8] = b"--";
-const BOUNDARY_PREFIX: &str = "------------------------";
-
-/// Constructs a `multipart/form-data` payload from bytes and metadata.
-///
-/// Returned header map can be extended or merged with existing headers.
-///
-/// Multipart boundary used is a random alphanumeric string.
-///
-/// # Examples
-///
-/// ```
-/// use actix_multipart::test::create_form_data_payload_and_headers;
-/// use actix_web::{test::TestRequest, web::Bytes};
-/// use memchr::memmem::find;
-///
-/// let (body, headers) = create_form_data_payload_and_headers(
-///     "foo",
-///     Some("lorem.txt".to_owned()),
-///     Some(mime::TEXT_PLAIN_UTF_8),
-///     Bytes::from_static(b"Lorem ipsum."),
-/// );
-///
-/// assert!(find(&body, b"foo").is_some());
-/// assert!(find(&body, b"lorem.txt").is_some());
-/// assert!(find(&body, b"text/plain; charset=utf-8").is_some());
-/// assert!(find(&body, b"Lorem ipsum.").is_some());
-///
-/// let req = TestRequest::default();
-///
-/// // merge header map into existing test request and set multipart body
-/// let req = headers
-///     .into_iter()
-///     .fold(req, |req, hdr| req.insert_header(hdr))
-///     .set_payload(body)
-///     .to_http_request();
-///
-/// assert!(
-///     req.headers()
-///         .get("content-type")
-///         .unwrap()
-///         .to_str()
-///         .unwrap()
-///         .starts_with("multipart/form-data; boundary=\"")
-/// );
-/// ```
-pub fn create_form_data_payload_and_headers(
-    name: &str,
-    filename: Option<String>,
-    content_type: Option<Mime>,
-    file: Bytes,
-) -> (Bytes, HeaderMap) {
-    let boundary = Alphanumeric.sample_string(&mut rand::rng(), 32);
-
-    create_form_data_payload_and_headers_with_boundary(
-        &boundary,
-        name,
-        filename,
-        content_type,
-        file,
-    )
-}
-
-/// Constructs a `multipart/form-data` payload from bytes and metadata with a fixed boundary.
-///
-/// See [`create_form_data_payload_and_headers`] for more details.
-pub fn create_form_data_payload_and_headers_with_boundary(
-    boundary: &str,
-    name: &str,
-    filename: Option<String>,
-    content_type: Option<Mime>,
-    file: Bytes,
-) -> (Bytes, HeaderMap) {
-    let mut buf = BytesMut::with_capacity(file.len() + 128);
-
-    let boundary_str = [BOUNDARY_PREFIX, boundary].concat();
-    let boundary = boundary_str.as_bytes();
-
-    buf.put(HYPHENS);
-    buf.put(boundary);
-    buf.put(CRLF);
-
-    buf.put(format!("Content-Disposition: form-data; name=\"{name}\"").as_bytes());
-    if let Some(filename) = filename {
-        buf.put(format!("; filename=\"{filename}\"").as_bytes());
-    }
-    buf.put(CRLF);
-
-    if let Some(ct) = content_type {
-        buf.put(format!("Content-Type: {ct}").as_bytes());
-        buf.put(CRLF);
-    }
-
-    buf.put(format!("Content-Length: {}", file.len()).as_bytes());
-    buf.put(CRLF_CRLF);
-
-    buf.put(file);
-    buf.put(CRLF);
-
-    buf.put(HYPHENS);
-    buf.put(boundary);
-    buf.put(HYPHENS);
-    buf.put(CRLF);
-
-    let mut headers = HeaderMap::new();
-    headers.insert(
-        header::CONTENT_TYPE,
-        format!("multipart/form-data; boundary=\"{boundary_str}\"")
-            .parse()
-            .unwrap(),
-    );
-
-    (buf.freeze(), headers)
-}
-
-#[cfg(test)]
-mod tests {
-    use std::convert::Infallible;
-
-    use futures_util::stream;
-
-    use super::*;
-
-    fn find_boundary(headers: &HeaderMap) -> String {
-        headers
-            .get("content-type")
-            .unwrap()
-            .to_str()
-            .unwrap()
-            .parse::<mime::Mime>()
-            .unwrap()
-            .get_param(mime::BOUNDARY)
-            .unwrap()
-            .as_str()
-            .to_owned()
-    }
-
-    #[test]
-    fn wire_format() {
-        let (pl, headers) = create_form_data_payload_and_headers_with_boundary(
-            "qWeRtYuIoP",
-            "foo",
-            None,
-            None,
-            Bytes::from_static(b"Lorem ipsum dolor\nsit ame."),
-        );
-
-        assert_eq!(
-            find_boundary(&headers),
-            "------------------------qWeRtYuIoP",
-        );
-
-        assert_eq!(
-            std::str::from_utf8(&pl).unwrap(),
-            "--------------------------qWeRtYuIoP\r\n\
-            Content-Disposition: form-data; name=\"foo\"\r\n\
-            Content-Length: 26\r\n\
-            \r\n\
-            Lorem ipsum dolor\n\
-            sit ame.\r\n\
-            --------------------------qWeRtYuIoP--\r\n",
-        );
-
-        let (pl, _headers) = create_form_data_payload_and_headers_with_boundary(
-            "qWeRtYuIoP",
-            "foo",
-            Some("Lorem.txt".to_owned()),
-            Some(mime::TEXT_PLAIN_UTF_8),
-            Bytes::from_static(b"Lorem ipsum dolor\nsit ame."),
-        );
-
-        assert_eq!(
-            std::str::from_utf8(&pl).unwrap(),
-            "--------------------------qWeRtYuIoP\r\n\
-            Content-Disposition: form-data; name=\"foo\"; filename=\"Lorem.txt\"\r\n\
-            Content-Type: text/plain; charset=utf-8\r\n\
-            Content-Length: 26\r\n\
-            \r\n\
-            Lorem ipsum dolor\n\
-            sit ame.\r\n\
-            --------------------------qWeRtYuIoP--\r\n",
-        );
-    }
-
-    /// Test using an external library to prevent the two-wrongs-make-a-right class of errors.
-    #[actix_web::test]
-    async fn ecosystem_compat() {
-        let (pl, headers) = create_form_data_payload_and_headers(
-            "foo",
-            None,
-            None,
-            Bytes::from_static(b"Lorem ipsum dolor\nsit ame."),
-        );
-
-        let boundary = find_boundary(&headers);
-
-        let pl = stream::once(async { Ok::<_, Infallible>(pl) });
-
-        let mut form = multer::Multipart::new(pl, boundary);
-        let field = form.next_field().await.unwrap().unwrap();
-        assert_eq!(field.name().unwrap(), "foo");
-        assert_eq!(field.file_name(), None);
-        assert_eq!(field.content_type(), None);
-        assert!(field.bytes().await.unwrap().starts_with(b"Lorem"));
-    }
-}

actix-router/CHANGES.md

@@ -2,11 +2,6 @@
 
 ## Unreleased
 
-## 0.5.3
-
-- Add `unicode` crate feature (on-by-default) to switch between `regex` and `regex-lite` as a trade-off between full unicode support and binary size.
-- Minimum supported Rust version (MSRV) is now 1.72.
-
 ## 0.5.2
 
 - Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.

actix-router/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-router"
-version = "0.5.3"
+version = "0.5.2"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com>",
@@ -12,23 +12,17 @@ repository = "https://github.com/actix/actix-web"
 license = "MIT OR Apache-2.0"
 edition = "2021"
 
-[package.metadata.cargo_check_external_types]
-allowed_external_types = [
-    "http::*",
-    "serde::*",
-]
+[lib]
+name = "actix_router"
+path = "src/lib.rs"
 
 [features]
-default = ["http", "unicode"]
-http = ["dep:http"]
-unicode = ["dep:regex"]
+default = ["http"]
 
 [dependencies]
 bytestring = ">=0.1.5, <2"
-cfg-if = "1"
 http = { version = "0.2.7", optional = true }
-regex = { version = "1.5", optional = true }
-regex-lite = "0.1"
+regex = "1.5"
 serde = "1"
 tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
@@ -38,13 +32,9 @@ http = "0.2.7"
 serde = { version = "1", features = ["derive"] }
 percent-encoding = "2.1"
 
-[lints]
-workspace = true
-
 [[bench]]
 name = "router"
 harness = false
-required-features = ["unicode"]
 
 [[bench]]
 name = "quoter"

actix-router/README.md

@@ -3,11 +3,11 @@
 <!-- prettier-ignore-start -->
 
 [![crates.io](https://img.shields.io/crates/v/actix-router?label=latest)](https://crates.io/crates/actix-router)
-[![Documentation](https://docs.rs/actix-router/badge.svg?version=0.5.3)](https://docs.rs/actix-router/0.5.3)
-![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+[![Documentation](https://docs.rs/actix-router/badge.svg?version=0.5.2)](https://docs.rs/actix-router/0.5.2)
+![Version](https://img.shields.io/badge/rustc-1.68+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-router.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-router/0.5.3/status.svg)](https://deps.rs/crate/actix-router/0.5.3)
+[![dependency status](https://deps.rs/crate/actix-router/0.5.2/status.svg)](https://deps.rs/crate/actix-router/0.5.2)
 [![Download](https://img.shields.io/crates/d/actix-router.svg)](https://crates.io/crates/actix-router)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 

actix-router/src/de.rs

@@ -500,10 +500,10 @@ impl<'de> de::VariantAccess<'de> for UnitVariant {
 
 #[cfg(test)]
 mod tests {
-    use serde::Deserialize;
+    use serde::{de, Deserialize};
 
     use super::*;
-    use crate::{router::Router, ResourceDef};
+    use crate::{path::Path, router::Router, ResourceDef};
 
     #[derive(Deserialize)]
     struct MyStruct {
@@ -511,6 +511,11 @@ mod tests {
         value: String,
     }
 
+    #[derive(Deserialize)]
+    struct Id {
+        _id: String,
+    }
+
     #[derive(Debug, Deserialize)]
     struct Test1(String, u32);
 

actix-router/src/lib.rs

@@ -1,5 +1,7 @@
 //! Resource path matching and router.
 
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
@@ -8,7 +10,6 @@ mod de;
 mod path;
 mod pattern;
 mod quoter;
-mod regex_set;
 mod resource;
 mod resource_path;
 mod router;