.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

@@ -32,7 +32,7 @@ jobs:
 
       - name: Install nasm
         if: matrix.target.os == 'windows-latest'
-        uses: ilammy/setup-nasm@v1.5.2
+        uses: ilammy/setup-nasm@v1.5.1
 
       - name: Install OpenSSL
         if: matrix.target.os == 'windows-latest'
@@ -44,12 +44,12 @@ 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.9.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
+        uses: taiki-e/install-action@v2.41.7
         with:
           tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
 
@@ -80,10 +80,10 @@ jobs:
         uses: rui314/setup-mold@v1
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
 
       - name: Install just, cargo-hack
-        uses: taiki-e/install-action@v2.49.39
+        uses: taiki-e/install-action@v2.41.7
         with:
           tool: just,cargo-hack
 

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
 
       - name: Install nasm
         if: matrix.target.os == 'windows-latest'
-        uses: ilammy/setup-nasm@v1.5.2
+        uses: ilammy/setup-nasm@v1.5.1
 
       - name: Install OpenSSL
         if: matrix.target.os == 'windows-latest'
@@ -59,12 +59,12 @@ jobs:
         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.9.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
+        uses: taiki-e/install-action@v2.41.7
         with:
           tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
 
@@ -92,7 +92,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.9.0
         with:
           toolchain: nightly
 
@@ -108,12 +108,12 @@ 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.9.0
         with:
           toolchain: nightly
 
       - name: Install just
-        uses: taiki-e/install-action@v2.49.39
+        uses: taiki-e/install-action@v2.41.7
         with:
           tool: just
 

.github/workflows/coverage.yml

@@ -18,13 +18,13 @@ 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.9.0
         with:
           toolchain: nightly
           components: llvm-tools
 
       - name: Install just, cargo-llvm-cov, cargo-nextest
-        uses: taiki-e/install-action@v2.49.39
+        uses: taiki-e/install-action@v2.41.7
         with:
           tool: just,cargo-llvm-cov,cargo-nextest
 
@@ -32,7 +32,7 @@ jobs:
         run: just test-coverage-codecov
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@v4.5.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.9.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.9.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.9.0
         with:
           toolchain: nightly
           components: rust-docs
@@ -66,25 +66,51 @@ jobs:
         run: cargo +nightly doc --no-deps --workspace --all-features
 
   check-external-types:
-    if: false # rustdoc mismatch currently
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install Rust (${{ vars.RUST_VERSION_EXTERNAL_TYPES }})
+      - name: Install Rust (nightly-2024-05-01)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
         with:
-          toolchain: ${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
+          toolchain: nightly-2024-05-01
 
       - name: Install just
-        uses: taiki-e/install-action@v2.49.39
+        uses: taiki-e/install-action@v2.41.7
         with:
           tool: just
 
       - name: Install cargo-check-external-types
-        uses: taiki-e/cache-cargo-install-action@v2.1.1
+        uses: taiki-e/cache-cargo-install-action@v2.0.1
         with:
           tool: cargo-check-external-types
 
       - name: check external types
-        run: just check-external-types-all +${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
+        run: just check-external-types-all +nightly-2024-05-01
+
+  public-api-diff:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout main branch
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.base_ref }}
+
+      - name: Checkout PR branch
+        uses: actions/checkout@v4
+
+      - name: Install Rust (nightly-2024-06-07)
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+        with:
+          toolchain: nightly-2024-06-07
+
+      - name: Install cargo-public-api
+        uses: taiki-e/install-action@v2.41.7
+        with:
+          tool: cargo-public-api
+
+      - name: Generate API diff
+        run: |
+          for f in $(find -mindepth 2 -maxdepth 2 -name Cargo.toml); do
+            cargo public-api --manifest-path "$f" --simplified diff ${{ github.event.pull_request.base.sha }}..${{ github.sha }}
+          done

.gitignore

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

Cargo.toml

@@ -19,7 +19,7 @@ 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.72"
 
 [profile.dev]
 # Disabling debug info speeds up builds a bunch and we don't rely on it for debugging that much.
@@ -51,11 +51,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,8 +2,6 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.75.
-
 ## 0.6.6
 
 - Update `tokio-uring` dependency to `0.4`.

actix-files/Cargo.toml

@@ -33,7 +33,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"
@@ -54,6 +54,3 @@ actix-test = "0.1"
 actix-web = "4"
 env_logger = "0.11"
 tempfile = "3.2"
-
-[lints]
-workspace = true

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))]

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/Cargo.toml

@@ -59,6 +59,3 @@ tokio = { version = "1.24.2", features = ["sync"] }
 
 [dev-dependencies]
 actix-http = "3"
-
-[lints]
-workspace = true

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,26 +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

actix-http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "3.10.0"
+version = "3.8.0"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "Rob Ede <robjtede@icloud.com>",
@@ -106,12 +106,12 @@ 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"
@@ -132,14 +132,14 @@ h2 = { version = "0.3.26", optional = true }
 # websockets
 local-channel = { version = "0.1", optional = true }
 base64 = { version = "0.22", optional = true }
-rand = { version = "0.9", 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 }
 
 # compress-*
-brotli = { version = "7", optional = true }
+brotli = { version = "6", optional = true }
 flate2 = { version = "1.0.13", optional = true }
 zstd = { version = "0.13", optional = true }
 
@@ -155,21 +155,18 @@ divan = "0.1.8"
 env_logger = "0.11"
 futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
 memchr = "2.4"
-once_cell = "1.21"
+once_cell = "1.9"
 rcgen = "0.13"
 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" }
 tokio = { version = "1.24.2", features = ["net", "rt", "macros"] }
 
-[lints]
-workspace = true
-
 [[example]]
 name = "ws"
 required-features = ["ws", "rustls-0_23"]

actix-http/README.md

@@ -5,11 +5,11 @@
 <!-- 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)
+[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.8.0)](https://docs.rs/actix-http/3.8.0)
 ![Version](https://img.shields.io/badge/rustc-1.72+-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.8.0/status.svg)](https://deps.rs/crate/actix-http/3.8.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)
 

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/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/ws.rs

@@ -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<()> {
@@ -36,12 +37,12 @@ async fn main() -> io::Result<()> {
 }
 
 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));
 

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

@@ -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,11 +389,11 @@ 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,
 }
 

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

@@ -480,15 +480,15 @@ where
         let cfg = self.cfg.clone();
 
         Box::pin(async move {
-            let expect = expect.await.map_err(|err| {
+            let expect = expect
-                tracing::error!("Initialization of HTTP expect service error: {err:?}");
+                .await
-            })?;
+                .map_err(|e| error!("Init http expect service error: {:?}", e))?;
 
             let upgrade = match upgrade {
                 Some(upgrade) => {
-                    let upgrade = upgrade.await.map_err(|err| {
+                    let upgrade = upgrade
-                        tracing::error!("Initialization of HTTP upgrade service error: {err:?}");
+                        .await
-                    })?;
+                        .map_err(|e| error!("Init http upgrade service error: {:?}", e))?;
                     Some(upgrade)
                 }
                 None => None,
@@ -496,7 +496,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 +541,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/service.rs

@@ -434,7 +434,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 {
+    pub fn insert(&mut self, key: HeaderName, val: HeaderValue) -> Removed {
-        let value = self.inner.insert(name, Value::one(val));
+        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,
+        CACHE_STATUS, CDN_CACHE_CONTROL, CROSS_ORIGIN_EMBEDDER_POLICY, CROSS_ORIGIN_OPENER_POLICY,
-        CROSS_ORIGIN_OPENER_POLICY, CROSS_ORIGIN_RESOURCE_POLICY, PERMISSIONS_POLICY,
+        CROSS_ORIGIN_RESOURCE_POLICY, PERMISSIONS_POLICY, X_FORWARDED_FOR, X_FORWARDED_HOST,
-        X_FORWARDED_FOR, X_FORWARDED_HOST, X_FORWARDED_PROTO,
+        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/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/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

@@ -20,6 +20,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,

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/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.
+    /// Takes current payload and replaces it with `None` value
-    #[must_use]
     pub fn take(&mut self) -> Payload<S> {
         mem::replace(self, Payload::None)
     }

actix-http/src/service.rs

@@ -775,23 +775,23 @@ where
         let cfg = self.cfg.clone();
 
         Box::pin(async move {
-            let expect = expect.await.map_err(|err| {
+            let expect = expect
-                tracing::error!("Initialization of HTTP expect service error: {err:?}");
+                .await
-            })?;
+                .map_err(|e| error!("Init http expect service error: {:?}", e))?;
 
             let upgrade = match upgrade {
                 Some(upgrade) => {
-                    let upgrade = upgrade.await.map_err(|err| {
+                    let upgrade = upgrade
-                        tracing::error!("Initialization of HTTP upgrade service error: {err:?}");
+                        .await
-                    })?;
+                        .map_err(|e| error!("Init http upgrade service error: {:?}", e))?;
                     Some(upgrade)
                 }
                 None => None,
             };
 
-            let service = service.await.map_err(|err| {
+            let service = service
-                tracing::error!("Initialization of HTTP service error: {err:?}");
+                .await
-            })?;
+                .map_err(|e| error!("Init http service error: {:?}", e))?;
 
             Ok(HttpServiceHandler::new(
                 cfg,
@@ -910,7 +910,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 +926,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),
+            read_buf: self.read_buf.clone(),
-            write_buf: Rc::clone(&self.write_buf),
+            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) => {
+                DispatcherError::Service(ref e) => {
-                    write!(fmt, "DispatcherError::Service({err:?})")
+                    write!(fmt, "DispatcherError::Service({:?})", e)
                 }
-                DispatcherError::Encoder(ref err) => {
+                DispatcherError::Encoder(ref e) => {
-                    write!(fmt, "DispatcherError::Encoder({err:?})")
+                    write!(fmt, "DispatcherError::Encoder({:?})", e)
                 }
-                DispatcherError::Decoder(ref err) => {
+                DispatcherError::Decoder(ref e) => {
-                    write!(fmt, "DispatcherError::Decoder({err:?})")
+                    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::Service(ref e) => write!(fmt, "{}", e),
-                DispatcherError::Encoder(ref err) => write!(fmt, "{err:?}"),
+                DispatcherError::Encoder(ref e) => write!(fmt, "{:?}", e),
-                DispatcherError::Decoder(ref err) => write!(fmt, "{err:?}"),
+                DispatcherError::Decoder(ref e) => write!(fmt, "{:?}", e),
             }
         }
     }

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,
 }
 

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

@@ -398,7 +398,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

@@ -480,7 +480,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_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()
+            let random_bytes: Vec<u8> = (0..*chunk_size).map(|_| rand::random::<u8>()).collect();
-                .sample_iter(rand::distr::StandardUniform)
-                .take(*chunk_size)
-                .collect::<Vec<_>>();
 
             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/Cargo.toml

@@ -18,8 +18,8 @@ all-features = true
 proc-macro = true
 
 [dependencies]
-bytesize = "2"
 darling = "0.20"
+parse-size = "1"
 proc-macro2 = "1"
 quote = "1"
 syn = "2"
@@ -27,8 +27,5 @@ syn = "2"
 [dev-dependencies]
 actix-multipart = "0.7"
 actix-web = "4"
-rustversion-msrv = "0.100"
+rustversion = "1"
 trybuild = "1"
-
-[lints]
-workspace = true

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`.
 ///
@@ -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>() {
+            let limit = match attrs.limit.map(|limit| match parse_size(&limit) {
-                Ok(ByteSize(size)) => Ok(usize::try_from(size).unwrap()),
+                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),

actix-multipart-derive/tests/trybuild.rs

@@ -1,4 +1,4 @@
-#[rustversion_msrv::msrv]
+#[rustversion::stable(1.72)] // 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,8 +2,6 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.75.
-
 ## 0.7.2
 
 - Fix re-exported version of `actix-multipart-derive`.

actix-multipart/Cargo.toml

@@ -4,14 +4,13 @@ version = "0.7.2"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "Jacob Halsey <jacob@jhalsey.com>",
-    "Rob Ede <robjtede@icloud.com>",
 ]
-description = "Multipart request & form support for Actix Web"
+description = "Multipart form support for Actix Web"
-keywords = ["http", "actix", "web", "multipart", "form"]
+keywords = ["http", "web", "framework", "async", "futures"]
-homepage.workspace = true
+homepage = "https://actix.rs"
-repository.workspace = true
+repository = "https://github.com/actix/actix-web"
-license.workspace = true
+license = "MIT OR Apache-2.0"
-edition.workspace = true
+edition = "2021"
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
@@ -42,7 +41,7 @@ actix-multipart-derive = { version = "=0.7.0", optional = true }
 actix-utils = "3"
 actix-web = { version = "4", default-features = false }
 
-derive_more = { version = "2", features = ["display", "error", "from"] }
+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 +49,7 @@ local-waker = "0.1"
 log = "0.4"
 memchr = "2.5"
 mime = "0.3"
-rand = "0.9"
+rand = "0.8"
 serde = "1"
 serde_json = "1"
 serde_plain = "1"
@@ -59,7 +58,7 @@ 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"
@@ -72,5 +71,7 @@ multer = "3"
 tokio = { version = "1.24.2", features = ["sync"] }
 tokio-stream = "0.1"
 
-[lints]
+[lints.rust]
-workspace = true
+future_incompatible = { level = "deny" }
+rust_2018_idioms = { level = "deny" }
+nonstandard_style = { level = "deny" }

actix-multipart/README.md

@@ -15,18 +15,14 @@
 
 <!-- cargo-rdme start -->
 
-Multipart request & form support for Actix Web.
+Multipart 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 actix_multipart::form::{json::Json as MPJson, tempfile::TempFile, MultipartForm};
 use serde::Deserialize;
 
 #[derive(Debug, Deserialize)]
@@ -38,7 +34,7 @@ struct Metadata {
 struct UploadForm {
     #[multipart(limit = "100MB")]
     file: TempFile,
-    json: MpJson<Metadata>,
+    json: MPJson<Metadata>,
 }
 
 #[post("/videos")]
@@ -67,8 +63,6 @@ curl -v --request POST \
   -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)

actix-multipart/src/error.rs

@@ -12,11 +12,11 @@ use derive_more::{Display, Error, From};
 #[non_exhaustive]
 pub enum Error {
     /// Could not find Content-Type header.
-    #[display("Could not find Content-Type header")]
+    #[display(fmt = "Could not find Content-Type header")]
     ContentTypeMissing,
 
     /// Could not parse Content-Type header.
-    #[display("Could not parse Content-Type header")]
+    #[display(fmt = "Could not parse Content-Type header")]
     ContentTypeParse,
 
     /// Parsed Content-Type did not have "multipart" top-level media type.
@@ -25,11 +25,11 @@ pub enum Error {
     /// "multipart/form-data" media type.
     ///
     /// [`MultipartForm`]: struct@crate::form::MultipartForm
-    #[display("Parsed Content-Type did not have 'multipart' top-level media type")]
+    #[display(fmt = "Parsed Content-Type did not have "multipart" top-level media type")]
     ContentTypeIncompatible,
 
     /// Multipart boundary is not found.
-    #[display("Multipart boundary is not found")]
+    #[display(fmt = "Multipart boundary is not found")]
     BoundaryMissing,
 
     /// Content-Disposition header was not found or not of disposition type "form-data" when parsing
@@ -39,7 +39,7 @@ pub enum Error {
     /// 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")]
+    #[display(fmt = "Content-Disposition header was not found when parsing a \"form-data\" field")]
     ContentDispositionMissing,
 
     /// Content-Disposition name parameter was not found when parsing a "form-data" field.
@@ -48,48 +48,48 @@ pub enum Error {
     /// 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")]
+    #[display(fmt = "Content-Disposition header was not found when parsing a \"form-data\" field")]
     ContentDispositionNameMissing,
 
     /// Nested multipart is not supported.
-    #[display("Nested multipart is not supported")]
+    #[display(fmt = "Nested multipart is not supported")]
     Nested,
 
     /// Multipart stream is incomplete.
-    #[display("Multipart stream is incomplete")]
+    #[display(fmt = "Multipart stream is incomplete")]
     Incomplete,
 
     /// Field parsing failed.
-    #[display("Error during field parsing")]
+    #[display(fmt = "Error during field parsing")]
     Parse(ParseError),
 
     /// HTTP payload error.
-    #[display("Payload error")]
+    #[display(fmt = "Payload error")]
     Payload(PayloadError),
 
     /// Stream is not consumed.
-    #[display("Stream is not consumed")]
+    #[display(fmt = "Stream is not consumed")]
     NotConsumed,
 
     /// Form field handler raised error.
-    #[display("An error occurred processing field: {name}")]
+    #[display(fmt = "An error occurred processing field: {name}")]
     Field {
         name: String,
         source: actix_web::Error,
     },
 
     /// Duplicate field found (for structure that opted-in to denying duplicate fields).
-    #[display("Duplicate field found: {_0}")]
+    #[display(fmt = "Duplicate field found: {_0}")]
     #[from(ignore)]
     DuplicateField(#[error(not(source))] String),
 
     /// Required field is missing.
-    #[display("Required field is missing: {_0}")]
+    #[display(fmt = "Required field is missing: {_0}")]
     #[from(ignore)]
     MissingField(#[error(not(source))] String),
 
     /// Unknown field (for structure that opted-in to denying unknown fields).
-    #[display("Unknown field: {_0}")]
+    #[display(fmt = "Unknown field: {_0}")]
     #[from(ignore)]
     UnknownField(#[error(not(source))] String),
 }

actix-multipart/src/field.rs

@@ -25,7 +25,7 @@ use crate::{
 
 /// 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")]
+#[display(fmt = "size limit exceeded while collecting field data")]
 #[non_exhaustive]
 pub struct LimitExceeded;
 
@@ -209,14 +209,8 @@ impl fmt::Debug for Field {
 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>,
 }
 
@@ -292,7 +286,6 @@ impl InnerField {
         let mut pos = 0;
 
         let len = payload.buf.len();
-
         if len == 0 {
             return if payload.eof {
                 Poll::Ready(Some(Err(Error::Incomplete)))
@@ -303,7 +296,7 @@ impl InnerField {
 
         // 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"--" {
+            let b_len = if &payload.buf[..2] == b"\r\n" && &payload.buf[2..4] == b"--" {
                 Some(4)
             } else if &payload.buf[1..3] == b"--" {
                 Some(3)
@@ -364,41 +357,40 @@ impl InnerField {
             return Poll::Ready(None);
         }
 
-        let Some(mut payload) = self
+        let result = if 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 {
+                    InnerField::read_len(&mut payload, len)
+                } else {
+                    InnerField::read_stream(&mut payload, &self.boundary)
+                };
 
-        if !self.eof {
+                match res {
-            let res = if let Some(ref mut len) = self.length {
+                    Poll::Pending => return Poll::Pending,
-                Self::read_len(&mut payload, len)
+                    Poll::Ready(Some(Ok(bytes))) => return Poll::Ready(Some(Ok(bytes))),
-            } else {
+                    Poll::Ready(Some(Err(err))) => return Poll::Ready(Some(Err(err))),
-                Self::read_stream(&mut payload, &self.boundary)
+                    Poll::Ready(None) => self.eof = true,
-            };
-
-            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);
+            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))),
+            }
+        } else {
+            Poll::Pending
+        };
 
         if let Poll::Ready(None) = result {
             // drop payload buffer and make future un-poll-able

actix-multipart/src/form/json.rs

@@ -66,11 +66,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,
 }
 

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,

actix-multipart/src/form/tempfile.rs

@@ -82,7 +82,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),
 }
 

actix-multipart/src/form/text.rs

@@ -77,15 +77,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,12 +1,4 @@
-//! Multipart request & form support for Actix Web.
+//! Multipart 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
 //!
@@ -53,8 +45,6 @@
 //!   -F 'json={"name": "Cargo.lock"};type=application/json' \
 //!   -F file=@./Cargo.lock
 //! ```
-//!
-//! [`MultipartForm`]: struct@form::MultipartForm
 
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]

actix-multipart/src/multipart.rs

@@ -483,7 +483,7 @@ mod tests {
     };
     use assert_matches::assert_matches;
     use futures_test::stream::StreamTestExt as _;
-    use futures_util::{stream, StreamExt as _};
+    use futures_util::{future::lazy, stream, StreamExt as _};
     use tokio::sync::mpsc;
     use tokio_stream::wrappers::UnboundedReceiverStream;
 
@@ -718,6 +718,100 @@ mod tests {
         }
     }
 
+    #[actix_rt::test]
+    async fn test_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 test_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 test_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_rt::test]
     async fn test_multipart_from_error() {
         let err = Error::ContentTypeMissing;

actix-multipart/src/payload.rs

@@ -122,13 +122,7 @@ impl PayloadBuffer {
         }
     }
 
-    /// Reads bytes until new line delimiter (`\n`, `0x0A`).
+    /// Reads bytes until new line delimiter.
-    ///
-    /// 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")
@@ -151,105 +145,3 @@ impl PayloadBuffer {
         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/test.rs

@@ -5,7 +5,10 @@ use actix_web::{
     web::{BufMut as _, Bytes, BytesMut},
 };
 use mime::Mime;
-use rand::distr::{Alphanumeric, SampleString as _};
+use rand::{
+    distributions::{Alphanumeric, DistString as _},
+    thread_rng,
+};
 
 const CRLF: &[u8] = b"\r\n";
 const CRLF_CRLF: &[u8] = b"\r\n\r\n";
@@ -61,7 +64,7 @@ pub fn create_form_data_payload_and_headers(
     content_type: Option<Mime>,
     file: Bytes,
 ) -> (Bytes, HeaderMap) {
-    let boundary = Alphanumeric.sample_string(&mut rand::rng(), 32);
+    let boundary = Alphanumeric.sample_string(&mut thread_rng(), 32);
 
     create_form_data_payload_and_headers_with_boundary(
         &boundary,

actix-router/Cargo.toml

@@ -38,9 +38,6 @@ http = "0.2.7"
 serde = { version = "1", features = ["derive"] }
 percent-encoding = "2.1"
 
-[lints]
-workspace = true
-
 [[bench]]
 name = "router"
 harness = false

actix-router/src/de.rs

@@ -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))]

actix-router/src/path.rs

@@ -143,9 +143,9 @@ impl<T: ResourcePath> Path<T> {
         for (seg_name, val) in self.segments.iter() {
             if name == seg_name {
                 return match val {
-                    PathItem::Static(ref seg) => Some(seg),
+                    PathItem::Static(ref s) => Some(s),
-                    PathItem::Segment(start, end) => {
+                    PathItem::Segment(s, e) => {
-                        Some(&self.path.path()[(*start as usize)..(*end as usize)])
+                        Some(&self.path.path()[(*s as usize)..(*e as usize)])
                     }
                 };
             }
@@ -193,10 +193,8 @@ impl<'a, T: ResourcePath> Iterator for PathIter<'a, T> {
         if self.idx < self.params.segment_count() {
             let idx = self.idx;
             let res = match self.params.segments[idx].1 {
-                PathItem::Static(ref seg) => seg,
+                PathItem::Static(ref s) => s,
-                PathItem::Segment(start, end) => {
+                PathItem::Segment(s, e) => &self.params.path.path()[(s as usize)..(e as usize)],
-                    &self.params.path.path()[(start as usize)..(end as usize)]
-                }
             };
             self.idx += 1;
             return Some((&self.params.segments[idx].0, res));
@@ -219,8 +217,8 @@ impl<T: ResourcePath> Index<usize> for Path<T> {
 
     fn index(&self, idx: usize) -> &str {
         match self.segments[idx].1 {
-            PathItem::Static(ref seg) => seg,
+            PathItem::Static(ref s) => s,
-            PathItem::Segment(start, end) => &self.path.path()[(start as usize)..(end as usize)],
+            PathItem::Segment(s, e) => &self.path.path()[(s as usize)..(e as usize)],
         }
     }
 }

actix-router/src/quoter.rs

@@ -105,7 +105,7 @@ fn hex_pair_to_char(d1: u8, d2: u8) -> Option<u8> {
     let d_low = char::from(d2).to_digit(16)?;
 
     // left shift high nibble by 4 bits
-    Some(((d_high as u8) << 4) | (d_low as u8))
+    Some((d_high as u8) << 4 | (d_low as u8))
 }
 
 #[derive(Debug, Default, Clone)]

actix-router/src/resource.rs

@@ -1021,7 +1021,6 @@ impl ResourceDef {
             panic!("prefix resource definitions should not have tail segments");
         }
 
-        #[allow(clippy::literal_string_with_formatting_args)]
         if unprocessed.ends_with('*') {
             // unnamed tail segment
 
@@ -1370,7 +1369,6 @@ mod tests {
         assert_eq!(path.unprocessed(), "");
     }
 
-    #[allow(clippy::literal_string_with_formatting_args)]
     #[test]
     fn newline_patterns_and_paths() {
         let re = ResourceDef::new("/user/a\nb");

actix-router/src/resource_path.rs

@@ -19,7 +19,7 @@ impl ResourcePath for String {
     }
 }
 
-impl ResourcePath for &str {
+impl<'a> ResourcePath for &'a str {
     fn path(&self) -> &str {
         self
     }

actix-router/src/router.rs

@@ -145,7 +145,6 @@ mod tests {
     };
 
     #[allow(clippy::cognitive_complexity)]
-    #[allow(clippy::literal_string_with_formatting_args)]
     #[test]
     fn test_recognizer_1() {
         let mut router = Router::<usize>::build();

actix-test/Cargo.toml

@@ -73,6 +73,3 @@ tls-rustls-0_21 = { package = "rustls", version = "0.21", optional = true }
 tls-rustls-0_22 = { package = "rustls", version = "0.22", optional = true }
 tls-rustls-0_23 = { package = "rustls", version = "0.23", default-features = false, optional = true }
 tokio = { version = "1.24.2", features = ["sync"] }
-
-[lints]
-workspace = true

actix-test/src/lib.rs

@@ -27,6 +27,8 @@
 //! }
 //! ```
 
+#![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))]

actix-web-actors/CHANGES.md

@@ -2,10 +2,7 @@
 
 ## Unreleased
 
-## 4.3.1 <!-- v4.3.1+deprecated -->
+- Take the encoded buffer when yielding bytes in the response stream rather than splitting the buffer, reducing memory use
-
-- Reduce memory usage by `take`-ing (rather than `split`-ing) the encoded buffer when yielding bytes in the response stream.
-- Mark crate as deprecated.
 - Minimum supported Rust version (MSRV) is now 1.72.
 
 ## 4.3.0

actix-web-actors/Cargo.toml

@@ -1,14 +1,13 @@
 [package]
 name = "actix-web-actors"
-version = "4.3.1+deprecated"
+version = "4.3.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix actors support for Actix Web"
 keywords = ["actix", "http", "web", "framework", "async"]
-homepage.workspace = true
+homepage = "https://actix.rs"
-repository.workspace = true
+repository = "https://github.com/actix/actix-web"
-license.workspace = true
+license = "MIT OR Apache-2.0"
-edition.workspace = true
+edition = "2021"
-rust-version.workspace = true
 
 [package.metadata.cargo_check_external_types]
 allowed_external_types = [
@@ -42,6 +41,3 @@ actix-web = { version = "4", features = ["macros"] }
 env_logger = "0.11"
 futures-util = { version = "0.3.17", default-features = false, features = ["std"] }
 mime = "0.3"
-
-[lints]
-workspace = true

actix-web-actors/README.md

@@ -1,17 +1,15 @@
 # `actix-web-actors`
 
 > Actix actors support for Actix Web.
->
-> This crate is deprecated. Migrate to [`actix-ws`](https://crates.io/crates/actix-ws).
 
 <!-- prettier-ignore-start -->
 
 [![crates.io](https://img.shields.io/crates/v/actix-web-actors?label=latest)](https://crates.io/crates/actix-web-actors)
-[![Documentation](https://docs.rs/actix-web-actors/badge.svg?version=4.3.1)](https://docs.rs/actix-web-actors/4.3.1)
+[![Documentation](https://docs.rs/actix-web-actors/badge.svg?version=4.3.0)](https://docs.rs/actix-web-actors/4.3.0)
 ![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
 ![License](https://img.shields.io/crates/l/actix-web-actors.svg)
 <br />
-![maintenance-status](https://img.shields.io/badge/maintenance-deprecated-red.svg)
+[![dependency status](https://deps.rs/crate/actix-web-actors/4.3.0/status.svg)](https://deps.rs/crate/actix-web-actors/4.3.0)
 [![Download](https://img.shields.io/crates/d/actix-web-actors.svg)](https://crates.io/crates/actix-web-actors)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 

actix-web-actors/src/lib.rs

@@ -1,7 +1,5 @@
 //! Actix actors support for Actix Web.
 //!
-//! This crate is deprecated. Migrate to [`actix-ws`](https://crates.io/crates/actix-ws).
-//!
 //! # Examples
 //!
 //! ```no_run
@@ -57,6 +55,8 @@
 //! * [`HttpContext`]: This struct provides actor support for streaming HTTP responses.
 //!
 
+#![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))]

actix-web-actors/src/ws.rs

@@ -796,8 +796,11 @@ where
             Some(frm) => {
                 let msg = match frm {
                     Frame::Text(data) => {
-                        Message::Text(ByteString::try_from(data).map_err(|err| {
+                        Message::Text(ByteString::try_from(data).map_err(|e| {
-                            ProtocolError::Io(io::Error::new(io::ErrorKind::Other, err))
+                            ProtocolError::Io(io::Error::new(
+                                io::ErrorKind::Other,
+                                format!("{}", e),
+                            ))
                         })?)
                     }
                     Frame::Binary(data) => Message::Binary(data),

actix-web-codegen/Cargo.toml

@@ -34,7 +34,4 @@ actix-web = "4"
 
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 trybuild = "1"
-rustversion-msrv = "0.100"
+rustversion = "1"
-
-[lints]
-workspace = true

actix-web-codegen/src/lib.rs

@@ -73,6 +73,8 @@
 //! [DELETE]: macro@delete
 
 #![recursion_limit = "512"]
+#![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))]

actix-web-codegen/tests/routes.rs

@@ -136,7 +136,7 @@ async fn routes_overlapping_inaccessible_test(req: HttpRequest) -> impl Responde
 }
 
 #[get("/custom_resource_name", name = "custom")]
-async fn custom_resource_name_test(req: HttpRequest) -> impl Responder {
+async fn custom_resource_name_test<'a>(req: HttpRequest) -> impl Responder {
     assert!(req.url_for_static("custom").is_ok());
     assert!(req.url_for_static("custom_resource_name_test").is_err());
     HttpResponse::Ok()
@@ -145,7 +145,7 @@ async fn custom_resource_name_test(req: HttpRequest) -> impl Responder {
 mod guard_module {
     use actix_web::{guard::GuardContext, http::header};
 
-    pub fn guard(ctx: &GuardContext<'_>) -> bool {
+    pub fn guard(ctx: &GuardContext) -> bool {
         ctx.header::<header::Accept>()
             .map(|h| h.preference() == "image/*")
             .unwrap_or(false)

actix-web-codegen/tests/scopes.rs

@@ -1,7 +1,7 @@
 use actix_web::{guard::GuardContext, http, http::header, web, App, HttpResponse, Responder};
 use actix_web_codegen::{delete, get, post, route, routes, scope};
 
-pub fn image_guard(ctx: &GuardContext<'_>) -> bool {
+pub fn image_guard(ctx: &GuardContext) -> bool {
     ctx.header::<header::Accept>()
         .map(|h| h.preference() == "image/*")
         .unwrap_or(false)

actix-web-codegen/tests/trybuild.rs

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

actix-web/CHANGES.md

@@ -2,33 +2,6 @@
 
 ## Unreleased
 
-## 4.10.2
-
-- No significant changes since `4.10.1`.
-
-## 4.10.1
-
-- No significant changes since `4.10.0`.
-
-## 4.10.0
-
-### Added
-
-- Implement `Responder` for `Result<(), E: Into<Error>>`. Returning `Ok(())` responds with HTTP 204 No Content.
-
-### Changed
-
-- On Windows, an error is now returned from `HttpServer::bind()` (or TLS variants) when binding to a socket that's already in use.
-- Update `brotli` dependency to `7`.
-- Minimum supported Rust version (MSRV) is now 1.75.
-
-## 4.9.0
-
-### Added
-
-- Add `middleware::from_fn()` helper.
-- Add `web::ThinData` extractor.
-
 ## 4.8.0
 
 ### Added

actix-web/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "4.10.2"
+version = "4.8.0"
 description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
@@ -137,25 +137,24 @@ actix-service = "2"
 actix-utils = "3"
 actix-tls = { version = "3.4", default-features = false, optional = true }
 
-actix-http = { version = "3.10", features = ["ws"] }
+actix-http = { version = "3.7", features = ["ws"] }
 actix-router = { version = "0.5.3", default-features = false, features = ["http"] }
 actix-web-codegen = { version = "4.3", optional = true, default-features = false }
 
+ahash = "0.8"
 bytes = "1"
 bytestring = "1"
 cfg-if = "1"
 cookie = { version = "0.16", features = ["percent-encode"], optional = true }
-derive_more = { version = "2", features = ["as_ref", "deref", "deref_mut", "display", "error", "from"] }
+derive_more = "0.99.8"
 encoding_rs = "0.8"
-foldhash = "0.1"
 futures-core = { version = "0.3.17", default-features = false }
 futures-util = { version = "0.3.17", default-features = false }
 itoa = "1"
-impl-more = "0.1.4"
 language-tags = "0.3"
 log = "0.4"
 mime = "0.3"
-once_cell = "1.21"
+once_cell = "1.5"
 pin-project-lite = "0.2.7"
 regex = { version = "1.5.5", optional = true }
 regex-lite = "0.1"
@@ -163,7 +162,6 @@ serde = "1.0"
 serde_json = "1.0"
 serde_urlencoded = "0.7"
 smallvec = "1.6.1"
-tracing = "0.1.30"
 socket2 = "0.5"
 time = { version = "0.3", default-features = false, features = ["formatting"] }
 url = "2.1"
@@ -173,26 +171,23 @@ actix-files = "0.6"
 actix-test = { version = "0.1", features = ["openssl", "rustls-0_23"] }
 awc = { version = "3", features = ["openssl"] }
 
-brotli = "7"
+brotli = "6"
 const-str = "0.5"
 core_affinity = "0.8"
 criterion = { version = "0.5", features = ["html_reports"] }
 env_logger = "0.11"
 flate2 = "1.0.13"
 futures-util = { version = "0.3.17", default-features = false, features = ["std"] }
-rand = "0.9"
+rand = "0.8"
 rcgen = "0.13"
 rustls-pemfile = "2"
-serde = { version = "1", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
 static_assertions = "1"
 tls-openssl = { package = "openssl", version = "0.10.55" }
 tls-rustls = { package = "rustls", version = "0.23" }
 tokio = { version = "1.24.2", features = ["rt-multi-thread", "macros"] }
 zstd = "0.13"
 
-[lints]
-workspace = true
-
 [[test]]
 name = "test_server"
 required-features = ["compress-brotli", "compress-gzip", "compress-zstd", "cookies"]

actix-web/README.md

@@ -8,13 +8,13 @@
 <!-- prettier-ignore-start -->
 
 [![crates.io](https://img.shields.io/crates/v/actix-web?label=latest)](https://crates.io/crates/actix-web)
-[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.10.2)](https://docs.rs/actix-web/4.10.2)
+[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.8.0)](https://docs.rs/actix-web/4.8.0)
 ![MSRV](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-web.svg)
-[![Dependency Status](https://deps.rs/crate/actix-web/4.10.2/status.svg)](https://deps.rs/crate/actix-web/4.10.2)
+[![Dependency Status](https://deps.rs/crate/actix-web/4.8.0/status.svg)](https://deps.rs/crate/actix-web/4.8.0)
 <br />
 [![CI](https://github.com/actix/actix-web/actions/workflows/ci.yml/badge.svg)](https://github.com/actix/actix-web/actions/workflows/ci.yml)
-[![codecov](https://codecov.io/gh/actix/actix-web/graph/badge.svg?token=dSwOnp9QCv)](https://codecov.io/gh/actix/actix-web)
+[![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web)
 ![downloads](https://img.shields.io/crates/d/actix-web.svg)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 

actix-web/benches/responder.rs

@@ -2,9 +2,11 @@ use std::{future::Future, time::Instant};
 
 use actix_http::body::BoxBody;
 use actix_utils::future::{ready, Ready};
-use actix_web::{http::StatusCode, test::TestRequest, Error, HttpRequest, HttpResponse, Responder};
+use actix_web::{
+    error, http::StatusCode, test::TestRequest, Error, HttpRequest, HttpResponse, Responder,
+};
 use criterion::{criterion_group, criterion_main, Criterion};
-use futures_util::future::join_all;
+use futures_util::future::{join_all, Either};
 
 // responder simulate the old responder trait.
 trait FutureResponder {
@@ -14,6 +16,9 @@ trait FutureResponder {
     fn future_respond_to(self, req: &HttpRequest) -> Self::Future;
 }
 
+// a simple option responder type.
+struct OptionResponder<T>(Option<T>);
+
 // a simple wrapper type around string
 struct StringResponder(String);
 
@@ -29,6 +34,22 @@ impl FutureResponder for StringResponder {
     }
 }
 
+impl<T> FutureResponder for OptionResponder<T>
+where
+    T: FutureResponder,
+    T::Future: Future<Output = Result<HttpResponse, Error>>,
+{
+    type Error = Error;
+    type Future = Either<T::Future, Ready<Result<HttpResponse, Self::Error>>>;
+
+    fn future_respond_to(self, req: &HttpRequest) -> Self::Future {
+        match self.0 {
+            Some(t) => Either::Left(t.future_respond_to(req)),
+            None => Either::Right(ready(Err(error::ErrorInternalServerError("err")))),
+        }
+    }
+}
+
 impl Responder for StringResponder {
     type Body = BoxBody;
 
@@ -39,6 +60,17 @@ impl Responder for StringResponder {
     }
 }
 
+impl<T: Responder> Responder for OptionResponder<T> {
+    type Body = BoxBody;
+
+    fn respond_to(self, req: &HttpRequest) -> HttpResponse<Self::Body> {
+        match self.0 {
+            Some(t) => t.respond_to(req).map_into_boxed_body(),
+            None => HttpResponse::from_error(error::ErrorInternalServerError("err")),
+        }
+    }
+}
+
 fn future_responder(c: &mut Criterion) {
     let rt = actix_rt::System::new();
     let req = TestRequest::default().to_http_request();

actix-web/examples/from_fn.rs

@@ -1,128 +0,0 @@
-//! Shows a few of ways to use the `from_fn` middleware.
-
-use std::{collections::HashMap, io, rc::Rc, time::Duration};
-
-use actix_web::{
-    body::MessageBody,
-    dev::{Service, ServiceRequest, ServiceResponse, Transform},
-    http::header::{self, HeaderValue, Range},
-    middleware::{from_fn, Logger, Next},
-    web::{self, Header, Query},
-    App, Error, HttpResponse, HttpServer,
-};
-use tracing::info;
-
-async fn noop<B>(req: ServiceRequest, next: Next<B>) -> Result<ServiceResponse<B>, Error> {
-    next.call(req).await
-}
-
-async fn print_range_header<B>(
-    range_header: Option<Header<Range>>,
-    req: ServiceRequest,
-    next: Next<B>,
-) -> Result<ServiceResponse<B>, Error> {
-    if let Some(Header(range)) = range_header {
-        println!("Range: {range}");
-    } else {
-        println!("No Range header");
-    }
-
-    next.call(req).await
-}
-
-async fn mutate_body_type(
-    req: ServiceRequest,
-    next: Next<impl MessageBody + 'static>,
-) -> Result<ServiceResponse<impl MessageBody>, Error> {
-    let res = next.call(req).await?;
-    Ok(res.map_into_left_body::<()>())
-}
-
-async fn mutate_body_type_with_extractors(
-    string_body: String,
-    query: Query<HashMap<String, String>>,
-    req: ServiceRequest,
-    next: Next<impl MessageBody + 'static>,
-) -> Result<ServiceResponse<impl MessageBody>, Error> {
-    println!("body is: {string_body}");
-    println!("query string: {query:?}");
-
-    let res = next.call(req).await?;
-
-    Ok(res.map_body(move |_, _| string_body))
-}
-
-async fn timeout_10secs(
-    req: ServiceRequest,
-    next: Next<impl MessageBody + 'static>,
-) -> Result<ServiceResponse<impl MessageBody>, Error> {
-    match tokio::time::timeout(Duration::from_secs(10), next.call(req)).await {
-        Ok(res) => res,
-        Err(_err) => Err(actix_web::error::ErrorRequestTimeout("")),
-    }
-}
-
-struct MyMw(bool);
-
-impl MyMw {
-    async fn mw_cb(
-        &self,
-        req: ServiceRequest,
-        next: Next<impl MessageBody + 'static>,
-    ) -> Result<ServiceResponse<impl MessageBody>, Error> {
-        let mut res = match self.0 {
-            true => req.into_response("short-circuited").map_into_right_body(),
-            false => next.call(req).await?.map_into_left_body(),
-        };
-
-        res.headers_mut()
-            .insert(header::WARNING, HeaderValue::from_static("42"));
-
-        Ok(res)
-    }
-
-    pub fn into_middleware<S, B>(
-        self,
-    ) -> impl Transform<
-        S,
-        ServiceRequest,
-        Response = ServiceResponse<impl MessageBody>,
-        Error = Error,
-        InitError = (),
-    >
-    where
-        S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error> + 'static,
-        B: MessageBody + 'static,
-    {
-        let this = Rc::new(self);
-        from_fn(move |req, next| {
-            let this = Rc::clone(&this);
-            async move { Self::mw_cb(&this, req, next).await }
-        })
-    }
-}
-
-#[actix_web::main]
-async fn main() -> io::Result<()> {
-    env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
-
-    let bind = ("127.0.0.1", 8080);
-    info!("staring server at http://{}:{}", &bind.0, &bind.1);
-
-    HttpServer::new(|| {
-        App::new()
-            .wrap(from_fn(noop))
-            .wrap(from_fn(print_range_header))
-            .wrap(from_fn(mutate_body_type))
-            .wrap(from_fn(mutate_body_type_with_extractors))
-            .wrap(from_fn(timeout_10secs))
-            // switch bool to true to observe early response
-            .wrap(MyMw(false).into_middleware())
-            .wrap(Logger::default())
-            .default_service(web::to(HttpResponse::Ok))
-    })
-    .workers(1)
-    .bind(bind)?
-    .run()
-    .await
-}

actix-web/examples/middleware_from_fn.rs

@@ -1,127 +0,0 @@
-//! Shows a couple of ways to use the `from_fn` middleware.
-
-use std::{collections::HashMap, io, rc::Rc, time::Duration};
-
-use actix_web::{
-    body::MessageBody,
-    dev::{Service, ServiceRequest, ServiceResponse, Transform},
-    http::header::{self, HeaderValue, Range},
-    middleware::{from_fn, Logger, Next},
-    web::{self, Header, Query},
-    App, Error, HttpResponse, HttpServer,
-};
-
-async fn noop<B>(req: ServiceRequest, next: Next<B>) -> Result<ServiceResponse<B>, Error> {
-    next.call(req).await
-}
-
-async fn print_range_header<B>(
-    range_header: Option<Header<Range>>,
-    req: ServiceRequest,
-    next: Next<B>,
-) -> Result<ServiceResponse<B>, Error> {
-    if let Some(Header(range)) = range_header {
-        println!("Range: {range}");
-    } else {
-        println!("No Range header");
-    }
-
-    next.call(req).await
-}
-
-async fn mutate_body_type(
-    req: ServiceRequest,
-    next: Next<impl MessageBody + 'static>,
-) -> Result<ServiceResponse<impl MessageBody>, Error> {
-    let res = next.call(req).await?;
-    Ok(res.map_into_left_body::<()>())
-}
-
-async fn mutate_body_type_with_extractors(
-    string_body: String,
-    query: Query<HashMap<String, String>>,
-    req: ServiceRequest,
-    next: Next<impl MessageBody + 'static>,
-) -> Result<ServiceResponse<impl MessageBody>, Error> {
-    println!("body is: {string_body}");
-    println!("query string: {query:?}");
-
-    let res = next.call(req).await?;
-
-    Ok(res.map_body(move |_, _| string_body))
-}
-
-async fn timeout_10secs(
-    req: ServiceRequest,
-    next: Next<impl MessageBody + 'static>,
-) -> Result<ServiceResponse<impl MessageBody>, Error> {
-    match tokio::time::timeout(Duration::from_secs(10), next.call(req)).await {
-        Ok(res) => res,
-        Err(_err) => Err(actix_web::error::ErrorRequestTimeout("")),
-    }
-}
-
-struct MyMw(bool);
-
-impl MyMw {
-    async fn mw_cb(
-        &self,
-        req: ServiceRequest,
-        next: Next<impl MessageBody + 'static>,
-    ) -> Result<ServiceResponse<impl MessageBody>, Error> {
-        let mut res = match self.0 {
-            true => req.into_response("short-circuited").map_into_right_body(),
-            false => next.call(req).await?.map_into_left_body(),
-        };
-
-        res.headers_mut()
-            .insert(header::WARNING, HeaderValue::from_static("42"));
-
-        Ok(res)
-    }
-
-    pub fn into_middleware<S, B>(
-        self,
-    ) -> impl Transform<
-        S,
-        ServiceRequest,
-        Response = ServiceResponse<impl MessageBody>,
-        Error = Error,
-        InitError = (),
-    >
-    where
-        S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error> + 'static,
-        B: MessageBody + 'static,
-    {
-        let this = Rc::new(self);
-        from_fn(move |req, next| {
-            let this = Rc::clone(&this);
-            async move { Self::mw_cb(&this, req, next).await }
-        })
-    }
-}
-
-#[actix_web::main]
-async fn main() -> io::Result<()> {
-    env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
-
-    let bind = ("127.0.0.1", 8080);
-    log::info!("staring server at http://{}:{}", &bind.0, &bind.1);
-
-    HttpServer::new(|| {
-        App::new()
-            .wrap(from_fn(noop))
-            .wrap(from_fn(print_range_header))
-            .wrap(from_fn(mutate_body_type))
-            .wrap(from_fn(mutate_body_type_with_extractors))
-            .wrap(from_fn(timeout_10secs))
-            // switch bool to true to observe early response
-            .wrap(MyMw(false).into_middleware())
-            .wrap(Logger::default())
-            .default_service(web::to(HttpResponse::Ok))
-    })
-    .workers(1)
-    .bind(bind)?
-    .run()
-    .await
-}

actix-web/src/app.rs

@@ -39,7 +39,7 @@ impl App<AppEntry> {
         let factory_ref = Rc::new(RefCell::new(None));
 
         App {
-            endpoint: AppEntry::new(Rc::clone(&factory_ref)),
+            endpoint: AppEntry::new(factory_ref.clone()),
             data_factories: Vec::new(),
             services: Vec::new(),
             default: None,
@@ -269,9 +269,9 @@ where
             + 'static,
         U::InitError: fmt::Debug,
     {
-        let svc = svc.into_factory().map_init_err(|err| {
+        let svc = svc
-            log::error!("Can not construct default service: {err:?}");
+            .into_factory()
-        });
+            .map_init_err(|e| log::error!("Can not construct default service: {:?}", e));
 
         self.default = Some(Rc::new(boxed::factory(svc)));
 

actix-web/src/app_service.rs

@@ -71,7 +71,7 @@ where
         });
 
         // create App config to pass to child services
-        let mut config = AppService::new(config, Rc::clone(&default));
+        let mut config = AppService::new(config, default.clone());
 
         // register services
         mem::take(&mut *self.services.borrow_mut())

actix-web/src/config.rs

@@ -68,7 +68,7 @@ impl AppService {
     pub(crate) fn clone_config(&self) -> Self {
         AppService {
             config: self.config.clone(),
-            default: Rc::clone(&self.default),
+            default: self.default.clone(),
             services: Vec::new(),
             root: false,
         }
@@ -81,7 +81,7 @@ impl AppService {
 
     /// Returns default handler factory.
     pub fn default_service(&self) -> Rc<BoxedHttpServiceFactory> {
-        Rc::clone(&self.default)
+        self.default.clone()
     }
 
     /// Register HTTP service.

actix-web/src/data.rs

@@ -184,7 +184,7 @@ impl<T: ?Sized + 'static> FromRequest for Data<T> {
 
 impl<T: ?Sized + 'static> DataFactory for Data<T> {
     fn create(&self, extensions: &mut Extensions) -> bool {
-        extensions.insert(Data(Arc::clone(&self.0)));
+        extensions.insert(Data(self.0.clone()));
         true
     }
 }

actix-web/src/error/mod.rs

@@ -29,7 +29,7 @@ pub type Result<T, E = Error> = std::result::Result<T, E>;
 
 /// An error representing a problem running a blocking task on a thread pool.
 #[derive(Debug, Display, Error)]
-#[display("Blocking thread pool is shut down unexpectedly")]
+#[display(fmt = "Blocking thread pool is shut down unexpectedly")]
 #[non_exhaustive]
 pub struct BlockingError;
 
@@ -40,15 +40,15 @@ impl ResponseError for crate::error::BlockingError {}
 #[non_exhaustive]
 pub enum UrlGenerationError {
     /// Resource not found.
-    #[display("Resource not found")]
+    #[display(fmt = "Resource not found")]
     ResourceNotFound,
 
     /// Not all URL parameters covered.
-    #[display("Not all URL parameters covered")]
+    #[display(fmt = "Not all URL parameters covered")]
     NotEnoughElements,
 
     /// URL parse error.
-    #[display("{}", _0)]
+    #[display(fmt = "{}", _0)]
     ParseError(UrlParseError),
 }
 
@@ -59,39 +59,39 @@ impl ResponseError for UrlGenerationError {}
 #[non_exhaustive]
 pub enum UrlencodedError {
     /// Can not decode chunked transfer encoding.
-    #[display("Can not decode chunked transfer encoding.")]
+    #[display(fmt = "Can not decode chunked transfer encoding.")]
     Chunked,
 
     /// Payload size is larger than allowed. (default limit: 256kB).
     #[display(
-        "URL encoded payload is larger ({} bytes) than allowed (limit: {} bytes).",
+        fmt = "URL encoded payload is larger ({} bytes) than allowed (limit: {} bytes).",
         size,
         limit
     )]
     Overflow { size: usize, limit: usize },
 
     /// Payload size is now known.
-    #[display("Payload size is now known.")]
+    #[display(fmt = "Payload size is now known.")]
     UnknownLength,
 
     /// Content type error.
-    #[display("Content type error.")]
+    #[display(fmt = "Content type error.")]
     ContentType,
 
     /// Parse error.
-    #[display("Parse error: {}.", _0)]
+    #[display(fmt = "Parse error: {}.", _0)]
     Parse(FormDeError),
 
     /// Encoding error.
-    #[display("Encoding error.")]
+    #[display(fmt = "Encoding error.")]
     Encoding,
 
     /// Serialize error.
-    #[display("Serialize error: {}.", _0)]
+    #[display(fmt = "Serialize error: {}.", _0)]
     Serialize(FormError),
 
     /// Payload error.
-    #[display("Error that occur during reading payload: {}.", _0)]
+    #[display(fmt = "Error that occur during reading payload: {}.", _0)]
     Payload(PayloadError),
 }
 
@@ -113,30 +113,30 @@ impl ResponseError for UrlencodedError {
 pub enum JsonPayloadError {
     /// Payload size is bigger than allowed & content length header set. (default: 2MB)
     #[display(
-        "JSON payload ({} bytes) is larger than allowed (limit: {} bytes).",
+        fmt = "JSON payload ({} bytes) is larger than allowed (limit: {} bytes).",
         length,
         limit
     )]
     OverflowKnownLength { length: usize, limit: usize },
 
     /// Payload size is bigger than allowed but no content length header set. (default: 2MB)
-    #[display("JSON payload has exceeded limit ({} bytes).", limit)]
+    #[display(fmt = "JSON payload has exceeded limit ({} bytes).", limit)]
     Overflow { limit: usize },
 
     /// Content type error
-    #[display("Content type error")]
+    #[display(fmt = "Content type error")]
     ContentType,
 
     /// Deserialize error
-    #[display("Json deserialize error: {}", _0)]
+    #[display(fmt = "Json deserialize error: {}", _0)]
     Deserialize(JsonError),
 
     /// Serialize error
-    #[display("Json serialize error: {}", _0)]
+    #[display(fmt = "Json serialize error: {}", _0)]
     Serialize(JsonError),
 
     /// Payload error
-    #[display("Error that occur during reading payload: {}", _0)]
+    #[display(fmt = "Error that occur during reading payload: {}", _0)]
     Payload(PayloadError),
 }
 
@@ -166,7 +166,7 @@ impl ResponseError for JsonPayloadError {
 #[non_exhaustive]
 pub enum PathError {
     /// Deserialize error
-    #[display("Path deserialize error: {}", _0)]
+    #[display(fmt = "Path deserialize error: {}", _0)]
     Deserialize(serde::de::value::Error),
 }
 
@@ -182,7 +182,7 @@ impl ResponseError for PathError {
 #[non_exhaustive]
 pub enum QueryPayloadError {
     /// Query deserialize error.
-    #[display("Query deserialize error: {}", _0)]
+    #[display(fmt = "Query deserialize error: {}", _0)]
     Deserialize(serde::de::value::Error),
 }
 
@@ -196,20 +196,20 @@ impl ResponseError for QueryPayloadError {
 #[derive(Debug, Display, Error, From)]
 #[non_exhaustive]
 pub enum ReadlinesError {
-    #[display("Encoding error")]
+    #[display(fmt = "Encoding error")]
     /// Payload size is bigger than allowed. (default: 256kB)
     EncodingError,
 
     /// Payload error.
-    #[display("Error that occur during reading payload: {}", _0)]
+    #[display(fmt = "Error that occur during reading payload: {}", _0)]
     Payload(PayloadError),
 
     /// Line limit exceeded.
-    #[display("Line limit exceeded")]
+    #[display(fmt = "Line limit exceeded")]
     LimitOverflow,
 
     /// ContentType error.
-    #[display("Content-type error")]
+    #[display(fmt = "Content-type error")]
     ContentTypeError(ContentTypeError),
 }
 

actix-web/src/handler.rs

@@ -19,7 +19,7 @@ use crate::{
 /// 1. It is an async function (or a function/closure that returns an appropriate future);
 /// 1. The function parameters (up to 12) implement [`FromRequest`];
 /// 1. The async function (or future) resolves to a type that can be converted into an
-///    [`HttpResponse`] (i.e., it implements the [`Responder`] trait).
+///   [`HttpResponse`] (i.e., it implements the [`Responder`] trait).
 ///
 ///
 /// # Compiler Errors