build(deps): bump taiki-e/install-action from 2.42.33 to 2.42.37 (#3464)

Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.42.33 to 2.42.37.
- [Release notes](https://github.com/taiki-e/install-action/releases)
- [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/taiki-e/install-action/compare/v2.42.33...v2.42.37)

---
updated-dependencies:
- dependency-name: taiki-e/install-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.clippy.toml

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

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

@@ -49,7 +49,7 @@ jobs:
           toolchain: ${{ matrix.version.version }}
 
       - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.41.7
+        uses: taiki-e/install-action@v2.42.37
         with:
           tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
 
@@ -83,7 +83,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
 
       - name: Install just, cargo-hack
-        uses: taiki-e/install-action@v2.41.7
+        uses: taiki-e/install-action@v2.42.37
         with:
           tool: just,cargo-hack
 

.github/workflows/ci.yml

@@ -64,7 +64,7 @@ jobs:
           toolchain: ${{ matrix.version.version }}
 
       - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.41.7
+        uses: taiki-e/install-action@v2.42.37
         with:
           tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
 
@@ -113,7 +113,7 @@ jobs:
           toolchain: nightly
 
       - name: Install just
-        uses: taiki-e/install-action@v2.41.7
+        uses: taiki-e/install-action@v2.42.37
         with:
           tool: just
 

.github/workflows/coverage.yml

@@ -24,7 +24,7 @@ jobs:
           components: llvm-tools
 
       - name: Install just, cargo-llvm-cov, cargo-nextest
-        uses: taiki-e/install-action@v2.41.7
+        uses: taiki-e/install-action@v2.42.37
         with:
           tool: just,cargo-llvm-cov,cargo-nextest
 

.github/workflows/lint.yml

@@ -76,7 +76,7 @@ jobs:
           toolchain: nightly-2024-05-01
 
       - name: Install just
-        uses: taiki-e/install-action@v2.41.7
+        uses: taiki-e/install-action@v2.42.37
         with:
           tool: just
 
@@ -105,7 +105,7 @@ jobs:
           toolchain: nightly-2024-06-07
 
       - name: Install cargo-public-api
-        uses: taiki-e/install-action@v2.41.7
+        uses: taiki-e/install-action@v2.42.37
         with:
           tool: cargo-public-api
 

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.72"
+rust-version = "1.75"
 
 [profile.dev]
 # Disabling debug info speeds up builds a bunch and we don't rely on it for debugging that much.
@@ -51,3 +51,11 @@ 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,6 +2,8 @@
 
 ## 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 = "0.99.5"
+derive_more = { version = "1", features = ["display", "error", "from"] }
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 http-range = "0.1.4"
 log = "0.4"
@@ -54,3 +54,6 @@ actix-test = "0.1"
 actix-web = "4"
 env_logger = "0.11"
 tempfile = "3.2"
+
+[lints]
+workspace = true

actix-files/src/error.rs

@@ -1,16 +1,16 @@
 use actix_web::{http::StatusCode, ResponseError};
-use derive_more::Display;
+use derive_more::derive::Display;
 
 /// Errors which can occur when serving static files.
 #[derive(Debug, PartialEq, Eq, Display)]
 pub enum FilesError {
     /// Path is not a directory.
     #[allow(dead_code)]
-    #[display(fmt = "path is not a directory. Unable to serve static files")]
+    #[display("path is not a directory. Unable to serve static files")]
     IsNotDirectory,
 
     /// Cannot render directory.
-    #[display(fmt = "unable to render directory without index file")]
+    #[display("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(fmt = "segment started with invalid character: ('{_0}')")]
+    #[display("segment started with invalid character: ('{_0}')")]
     BadStart(char),
 
     /// Segment contained the wrapped invalid character.
-    #[display(fmt = "segment contained invalid character ('{_0}')")]
+    #[display("segment contained invalid character ('{_0}')")]
     BadChar(char),
 
     /// Segment ended with the wrapped invalid character.
-    #[display(fmt = "segment ended with invalid character: ('{_0}')")]
+    #[display("segment ended with invalid character: ('{_0}')")]
     BadEnd(char),
 
     /// Path is not a valid UTF-8 string after percent-decoding.
-    #[display(fmt = "path is not a valid UTF-8 string after percent-decoding")]
+    #[display("path is not a valid UTF-8 string after percent-decoding")]
     NotValidUtf8,
 }
 

actix-files/src/lib.rs

@@ -11,8 +11,7 @@
 //!     .service(Files::new("/static", ".").prefer_utf8(true));
 //! ```
 
-#![deny(rust_2018_idioms, nonstandard_style)]
-#![warn(future_incompatible, missing_docs, missing_debug_implementations)]
+#![warn(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/named.rs

@@ -21,7 +21,7 @@ use actix_web::{
     Error, HttpMessage, HttpRequest, HttpResponse, Responder,
 };
 use bitflags::bitflags;
-use derive_more::{Deref, DerefMut};
+use derive_more::derive::{Deref, DerefMut};
 use futures_core::future::LocalBoxFuture;
 use mime::Mime;
 

actix-files/src/range.rs

@@ -1,6 +1,6 @@
 use std::fmt;
 
-use derive_more::Error;
+use derive_more::derive::Error;
 
 /// Copy of `http_range::HttpRangeParseError`.
 #[derive(Debug, Clone)]

actix-files/src/service.rs

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

actix-http-test/Cargo.toml

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

actix-http-test/src/lib.rs

@@ -1,7 +1,5 @@
 //! 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))]
@@ -108,7 +106,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(|e| log::error!("Can not set alpn protocol: {:?}", e));
+                .map_err(|err| log::error!("Can not set ALPN protocol: {err}"));
 
             Connector::new()
                 .conn_lifetime(Duration::from_secs(0))

actix-http/CHANGES.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+- 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.8.0"
+version = "3.9.0"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "Rob Ede <robjtede@icloud.com>",
@@ -110,7 +110,7 @@ ahash = "0.8"
 bitflags = "2"
 bytes = "1"
 bytestring = "1"
-derive_more = "0.99.5"
+derive_more = { version = "1", features = ["as_ref", "deref", "deref_mut", "display", "error", "from"] }
 encoding_rs = "0.8"
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 http = "0.2.7"
@@ -160,13 +160,16 @@ rcgen = "0.13"
 regex = "1.3"
 rustversion = "1"
 rustls-pemfile = "2"
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1", 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.8.0)](https://docs.rs/actix-http/3.8.0)
+[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.9.0)](https://docs.rs/actix-http/3.9.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.8.0/status.svg)](https://deps.rs/crate/actix-http/3.8.0)
+[![dependency status](https://deps.rs/crate/actix-http/3.9.0/status.svg)](https://deps.rs/crate/actix-http/3.9.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};
+use actix_web::{dev::AppConfig, get, App, Responder};
 
 #[get("/")]
-async fn index() -> &'static str {
+async fn index() -> impl Responder {
     "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,8 +31,7 @@ async fn main() -> io::Result<()> {
 
                     Ok::<_, Error>(res)
                 })
-                // No TLS
-                .tcp()
+                .tcp() // No TLS
         })?
         .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_millis(1000)).await;
+                        actix_rt::time::sleep(Duration::from_secs(1)).await;
 
-                        yield Err(io::Error::new(io::ErrorKind::Other, ""));
+                        yield Err(io::Error::new(io::ErrorKind::Other, "abc"));
                     })))
                 })
                 .tcp()

actix-http/examples/ws.rs

@@ -17,7 +17,6 @@ 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<()> {
@@ -37,12 +36,12 @@ async fn main() -> io::Result<()> {
 }
 
 async fn handler(req: Request) -> Result<Response<BodyStream<Heartbeat>>, Error> {
-    info!("handshaking");
+    tracing::info!("handshaking");
     let mut res = ws::handshake(req.head())?;
 
     // handshake will always fail under HTTP/2
 
-    info!("responding");
+    tracing::info!("responding");
     res.message_body(BodyStream::new(Heartbeat::new(ws::Codec::new())))
 }
 
@@ -64,7 +63,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>> {
-        trace!("poll");
+        tracing::trace!("poll");
 
         ready!(self.as_mut().interval.poll_tick(cx));
 

actix-http/src/body/body_stream.rs

@@ -75,7 +75,7 @@ mod tests {
         time::{sleep, Sleep},
     };
     use actix_utils::future::poll_fn;
-    use derive_more::{Display, Error};
+    use derive_more::derive::{Display, Error};
     use futures_core::ready;
     use futures_util::{stream, FutureExt as _};
     use pin_project_lite::pin_project;
@@ -131,7 +131,7 @@ mod tests {
         assert_eq!(to_bytes(body).await.ok(), Some(Bytes::from("12")));
     }
     #[derive(Debug, Display, Error)]
-    #[display(fmt = "stream error")]
+    #[display("stream error")]
     struct StreamErr;
 
     #[actix_rt::test]

actix-http/src/body/utils.rs

@@ -3,7 +3,7 @@ use std::task::Poll;
 use actix_rt::pin;
 use actix_utils::future::poll_fn;
 use bytes::{Bytes, BytesMut};
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use futures_core::ready;
 
 use super::{BodySize, MessageBody};
@@ -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(fmt = "limit exceeded while collecting body bytes")]
+#[display("limit exceeded while collecting body bytes")]
 #[non_exhaustive]
 pub struct BodyLimitExceeded;
 

actix-http/src/encoding/encoder.rs

@@ -10,7 +10,7 @@ use std::{
 
 use actix_rt::task::{spawn_blocking, JoinHandle};
 use bytes::Bytes;
-use derive_more::Display;
+use derive_more::derive::Display;
 #[cfg(feature = "compress-gzip")]
 use flate2::write::{GzEncoder, ZlibEncoder};
 use futures_core::ready;
@@ -415,11 +415,11 @@ fn new_brotli_compressor() -> Box<brotli::CompressorWriter<Writer>> {
 #[non_exhaustive]
 pub enum EncoderError {
     /// Wrapped body stream error.
-    #[display(fmt = "body")]
+    #[display("body")]
     Body(Box<dyn StdError>),
 
     /// Generic I/O error.
-    #[display(fmt = "io")]
+    #[display("io")]
     Io(io::Error),
 }
 

actix-http/src/error.rs

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

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(|e| io::Error::new(io::ErrorKind::Other, e))
+        .map_err(|err| io::Error::new(io::ErrorKind::Other, err))
     }
 }
 
@@ -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(|e| io::Error::new(io::ErrorKind::Other, e))?;
+                        .map_err(|err| io::Error::new(io::ErrorKind::Other, err))?;
 
                     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(|e| error!("Init http expect service error: {:?}", e))?;
+            let expect = expect.await.map_err(|err| {
+                tracing::error!("Initialization of HTTP expect service error: {err:?}");
+            })?;
 
             let upgrade = match upgrade {
                 Some(upgrade) => {
-                    let upgrade = upgrade
-                        .await
-                        .map_err(|e| error!("Init http upgrade service error: {:?}", e))?;
+                    let upgrade = upgrade.await.map_err(|err| {
+                        tracing::error!("Initialization of HTTP upgrade service error: {err:?}");
+                    })?;
                     Some(upgrade)
                 }
                 None => None,
@@ -496,7 +496,7 @@ where
 
             let service = service
                 .await
-                .map_err(|e| error!("Init http service error: {:?}", e))?;
+                .map_err(|err| error!("Initialization of HTTP service error: {err:?}"))?;
 
             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, self.flow.clone(), self.cfg.clone(), addr, conn_data)
+        Dispatcher::new(io, Rc::clone(&self.flow), self.cfg.clone(), addr, conn_data)
     }
 }

actix-http/src/h2/service.rs

@@ -434,7 +434,7 @@ where
 
         H2ServiceHandlerResponse {
             state: State::Handshake(
-                Some(self.flow.clone()),
+                Some(Rc::clone(&self.flow)),
                 Some(self.cfg.clone()),
                 addr,
                 on_connect_data,

actix-http/src/header/map.rs

@@ -13,8 +13,9 @@ 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();
 ///
@@ -29,6 +30,21 @@ 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: AHashMap<HeaderName, Value>,
@@ -368,8 +384,8 @@ impl HeaderMap {
     /// let removed = map.insert(header::ACCEPT, HeaderValue::from_static("text/html"));
     /// assert!(!removed.is_empty());
     /// ```
-    pub fn insert(&mut self, key: HeaderName, val: HeaderValue) -> Removed {
-        let value = self.inner.insert(key, Value::one(val));
+    pub fn insert(&mut self, name: HeaderName, val: HeaderValue) -> Removed {
+        let value = self.inner.insert(name, Value::one(val));
         Removed::new(value)
     }
 
@@ -636,6 +652,16 @@ 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 {

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

@@ -1,6 +1,6 @@
 use std::str::FromStr;
 
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use http::header::InvalidHeaderValue;
 
 use crate::{
@@ -11,7 +11,7 @@ use crate::{
 
 /// Error returned when a content encoding is unknown.
 #[derive(Debug, Display, Error)]
-#[display(fmt = "unsupported content encoding")]
+#[display("unsupported content encoding")]
 pub struct ContentEncodingParseError;
 
 /// Represents a supported content encoding.

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

@@ -1,6 +1,6 @@
 use std::fmt;
 
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 
 const MAX_QUALITY_INT: u16 = 1000;
 const MAX_QUALITY_FLOAT: f32 = 1.0;
@@ -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(fmt = "quality out of bounds")]
+#[display("quality out of bounds")]
 #[non_exhaustive]
 pub struct QualityOutOfBounds;
 

actix-http/src/lib.rs

@@ -20,8 +20,6 @@
 //! [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(self.head.clone()))
+        T::with_pool(|p| p.release(Rc::clone(&self.head)))
     }
 }
 

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(|e| error!("Init http expect service error: {:?}", e))?;
+            let expect = expect.await.map_err(|err| {
+                tracing::error!("Initialization of HTTP expect service error: {err:?}");
+            })?;
 
             let upgrade = match upgrade {
                 Some(upgrade) => {
-                    let upgrade = upgrade
-                        .await
-                        .map_err(|e| error!("Init http upgrade service error: {:?}", e))?;
+                    let upgrade = upgrade.await.map_err(|err| {
+                        tracing::error!("Initialization of HTTP upgrade service error: {err:?}");
+                    })?;
                     Some(upgrade)
                 }
                 None => None,
             };
 
-            let service = service
-                .await
-                .map_err(|e| error!("Init http service error: {:?}", e))?;
+            let service = service.await.map_err(|err| {
+                tracing::error!("Initialization of HTTP service error: {err:?}");
+            })?;
 
             Ok(HttpServiceHandler::new(
                 cfg,
@@ -910,7 +910,7 @@ where
                     handshake: Some((
                         crate::h2::handshake_with_timeout(io, &self.cfg),
                         self.cfg.clone(),
-                        self.flow.clone(),
+                        Rc::clone(&self.flow),
                         conn_data,
                         peer_addr,
                     )),
@@ -926,7 +926,7 @@ where
                 state: State::H1 {
                     dispatcher: h1::Dispatcher::new(
                         io,
-                        self.flow.clone(),
+                        Rc::clone(&self.flow),
                         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: self.read_buf.clone(),
-            write_buf: self.write_buf.clone(),
+            read_buf: Rc::clone(&self.read_buf),
+            write_buf: Rc::clone(&self.write_buf),
             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 e) => {
-                    write!(fmt, "DispatcherError::Service({:?})", e)
+                DispatcherError::Service(ref err) => {
+                    write!(fmt, "DispatcherError::Service({err:?})")
                 }
-                DispatcherError::Encoder(ref e) => {
-                    write!(fmt, "DispatcherError::Encoder({:?})", e)
+                DispatcherError::Encoder(ref err) => {
+                    write!(fmt, "DispatcherError::Encoder({err:?})")
                 }
-                DispatcherError::Decoder(ref e) => {
-                    write!(fmt, "DispatcherError::Decoder({:?})", e)
+                DispatcherError::Decoder(ref err) => {
+                    write!(fmt, "DispatcherError::Decoder({err:?})")
                 }
             }
         }
@@ -136,9 +136,9 @@ mod inner {
     {
         fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
             match *self {
-                DispatcherError::Service(ref e) => write!(fmt, "{}", e),
-                DispatcherError::Encoder(ref e) => write!(fmt, "{:?}", e),
-                DispatcherError::Decoder(ref e) => write!(fmt, "{:?}", e),
+                DispatcherError::Service(ref err) => write!(fmt, "{err}"),
+                DispatcherError::Encoder(ref err) => write!(fmt, "{err:?}"),
+                DispatcherError::Decoder(ref err) => write!(fmt, "{err:?}"),
             }
         }
     }

actix-http/src/ws/mod.rs

@@ -5,7 +5,7 @@
 
 use std::io;
 
-use derive_more::{Display, Error, From};
+use derive_more::derive::{Display, Error, From};
 use http::{header, Method, StatusCode};
 
 use crate::{body::BoxBody, header::HeaderValue, RequestHead, Response, ResponseBuilder};
@@ -27,43 +27,43 @@ pub use self::{
 #[derive(Debug, Display, Error, From)]
 pub enum ProtocolError {
     /// Received an unmasked frame from client.
-    #[display(fmt = "received an unmasked frame from client")]
+    #[display("received an unmasked frame from client")]
     UnmaskedFrame,
 
     /// Received a masked frame from server.
-    #[display(fmt = "received a masked frame from server")]
+    #[display("received a masked frame from server")]
     MaskedFrame,
 
     /// Encountered invalid opcode.
-    #[display(fmt = "invalid opcode ({})", _0)]
+    #[display("invalid opcode ({})", _0)]
     InvalidOpcode(#[error(not(source))] u8),
 
     /// Invalid control frame length
-    #[display(fmt = "invalid control frame length ({})", _0)]
+    #[display("invalid control frame length ({})", _0)]
     InvalidLength(#[error(not(source))] usize),
 
     /// Bad opcode.
-    #[display(fmt = "bad opcode")]
+    #[display("bad opcode")]
     BadOpCode,
 
     /// A payload reached size limit.
-    #[display(fmt = "payload reached size limit")]
+    #[display("payload reached size limit")]
     Overflow,
 
     /// Continuation has not started.
-    #[display(fmt = "continuation has not started")]
+    #[display("continuation has not started")]
     ContinuationNotStarted,
 
     /// Received new continuation but it is already started.
-    #[display(fmt = "received new continuation but it has already started")]
+    #[display("received new continuation but it has already started")]
     ContinuationStarted,
 
     /// Unknown continuation fragment.
-    #[display(fmt = "unknown continuation fragment: {}", _0)]
+    #[display("unknown continuation fragment: {}", _0)]
     ContinuationFragment(#[error(not(source))] OpCode),
 
     /// I/O error.
-    #[display(fmt = "I/O error: {}", _0)]
+    #[display("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(fmt = "method not allowed")]
+    #[display("method not allowed")]
     GetMethodRequired,
 
     /// Upgrade header if not set to WebSocket.
-    #[display(fmt = "WebSocket upgrade is expected")]
+    #[display("WebSocket upgrade is expected")]
     NoWebsocketUpgrade,
 
     /// Connection header is not set to upgrade.
-    #[display(fmt = "connection upgrade is expected")]
+    #[display("connection upgrade is expected")]
     NoConnectionUpgrade,
 
     /// WebSocket version header is not set.
-    #[display(fmt = "WebSocket version header is required")]
+    #[display("WebSocket version header is required")]
     NoVersionHeader,
 
     /// Unsupported WebSocket version.
-    #[display(fmt = "unsupported WebSocket version")]
+    #[display("unsupported WebSocket version")]
     UnsupportedVersion,
 
     /// WebSocket key is not set or wrong.
-    #[display(fmt = "unknown WebSocket key")]
+    #[display("unknown WebSocket key")]
     BadWebsocketKey,
 }
 

actix-http/tests/test_client.rs

@@ -5,7 +5,7 @@ use actix_http_test::test_server;
 use actix_service::ServiceFactoryExt;
 use actix_utils::future;
 use bytes::Bytes;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use futures_util::StreamExt as _;
 
 const STR: &str = "Hello World Hello World Hello World Hello World Hello World \
@@ -94,7 +94,7 @@ async fn with_query_parameter() {
 }
 
 #[derive(Debug, Display, Error)]
-#[display(fmt = "expect failed")]
+#[display("expect failed")]
 struct ExpectFailed;
 
 impl From<ExpectFailed> for Response<BoxBody> {

actix-http/tests/test_openssl.rs

@@ -14,7 +14,7 @@ use actix_http_test::test_server;
 use actix_service::{fn_service, ServiceFactoryExt};
 use actix_utils::future::{err, ok, ready};
 use bytes::{Bytes, BytesMut};
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use futures_core::Stream;
 use futures_util::{stream::once, StreamExt as _};
 use openssl::{
@@ -398,7 +398,7 @@ async fn h2_response_http_error_handling() {
 }
 
 #[derive(Debug, Display, Error)]
-#[display(fmt = "error")]
+#[display("error")]
 struct BadRequest;
 
 impl From<BadRequest> for Response<BoxBody> {

actix-http/tests/test_rustls.rs

@@ -23,7 +23,7 @@ use actix_service::{fn_factory_with_config, fn_service};
 use actix_tls::connect::rustls_0_23::webpki_roots_cert_store;
 use actix_utils::future::{err, ok, poll_fn};
 use bytes::{Bytes, BytesMut};
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use futures_core::{ready, Stream};
 use futures_util::stream::once;
 use rustls::{pki_types::ServerName, ServerConfig as RustlsServerConfig};
@@ -480,7 +480,7 @@ async fn h2_response_http_error_handling() {
 }
 
 #[derive(Debug, Display, Error)]
-#[display(fmt = "error")]
+#[display("error")]
 struct BadRequest;
 
 impl From<BadRequest> for Response<BoxBody> {

actix-http/tests/test_server.rs

@@ -14,7 +14,7 @@ use actix_rt::{net::TcpStream, time::sleep};
 use actix_service::fn_service;
 use actix_utils::future::{err, ok, ready};
 use bytes::Bytes;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use futures_util::{stream::once, FutureExt as _, StreamExt as _};
 use regex::Regex;
 
@@ -62,7 +62,7 @@ async fn h1_2() {
 }
 
 #[derive(Debug, Display, Error)]
-#[display(fmt = "expect failed")]
+#[display("expect failed")]
 struct ExpectFailed;
 
 impl From<ExpectFailed> for Response<BoxBody> {
@@ -723,7 +723,7 @@ async fn h1_response_http_error_handling() {
 }
 
 #[derive(Debug, Display, Error)]
-#[display(fmt = "error")]
+#[display("error")]
 struct BadRequest;
 
 impl From<BadRequest> for Response<BoxBody> {

actix-http/tests/test_ws.rs

@@ -14,7 +14,7 @@ use actix_http::{
 use actix_http_test::test_server;
 use actix_service::{fn_factory, Service};
 use bytes::Bytes;
-use derive_more::{Display, Error, From};
+use derive_more::derive::{Display, Error, From};
 use futures_core::future::LocalBoxFuture;
 use futures_util::{SinkExt as _, StreamExt as _};
 
@@ -37,16 +37,16 @@ impl WsService {
 
 #[derive(Debug, Display, Error, From)]
 enum WsServiceError {
-    #[display(fmt = "HTTP error")]
+    #[display("HTTP error")]
     Http(actix_http::Error),
 
-    #[display(fmt = "WS handshake error")]
+    #[display("WS handshake error")]
     Ws(actix_http::ws::HandshakeError),
 
-    #[display(fmt = "I/O error")]
+    #[display("I/O error")]
     Io(std::io::Error),
 
-    #[display(fmt = "dispatcher error")]
+    #[display("dispatcher error")]
     Dispatcher,
 }
 

actix-multipart-derive/Cargo.toml

@@ -29,3 +29,6 @@ actix-multipart = "0.7"
 actix-web = "4"
 rustversion = "1"
 trybuild = "1"
+
+[lints]
+workspace = true

actix-multipart-derive/src/lib.rs

@@ -2,11 +2,10 @@
 //!
 //! 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;
 
@@ -37,6 +36,7 @@ struct MultipartFormAttrs {
     duplicate_field: DuplicateField,
 }
 
+#[allow(clippy::disallowed_names)] // false positive in macro expansion
 #[derive(FromField, Default)]
 #[darling(attributes(multipart), default)]
 struct FieldAttrs {

actix-multipart/CHANGES.md

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

actix-multipart/README.md

@@ -15,14 +15,18 @@
 
 <!-- cargo-rdme start -->
 
-Multipart form support for Actix Web.
+Multipart request & form support for Actix Web.
+
+The [`Multipart`] extractor aims to support all kinds of `multipart/*` requests, including `multipart/form-data`, `multipart/related` and `multipart/mixed`. This is a lower-level extractor which supports reading [multipart fields](Field), in the order they are sent by the client.
+
+Due to additional requirements for `multipart/form-data` requests, the higher level [`MultipartForm`] extractor and derive macro only supports this media type.
 
 ## Examples
 
 ```rust
 use actix_web::{post, App, HttpServer, Responder};
 
-use actix_multipart::form::{json::Json as MPJson, tempfile::TempFile, MultipartForm};
+use actix_multipart::form::{json::Json as MpJson, tempfile::TempFile, MultipartForm};
 use serde::Deserialize;
 
 #[derive(Debug, Deserialize)]
@@ -34,7 +38,7 @@ struct Metadata {
 struct UploadForm {
     #[multipart(limit = "100MB")]
     file: TempFile,
-    json: MPJson<Metadata>,
+    json: MpJson<Metadata>,
 }
 
 #[post("/videos")]
@@ -63,6 +67,8 @@ 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

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

actix-multipart/src/field.rs

@@ -13,7 +13,7 @@ use actix_web::{
     http::header::{self, ContentDisposition, HeaderMap},
     web::{Bytes, BytesMut},
 };
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use futures_core::Stream;
 use mime::Mime;
 
@@ -25,7 +25,7 @@ use crate::{
 
 /// Error type returned from [`Field::bytes()`] when field data is larger than limit.
 #[derive(Debug, Display, Error)]
-#[display(fmt = "size limit exceeded while collecting field data")]
+#[display("size limit exceeded while collecting field data")]
 #[non_exhaustive]
 pub struct LimitExceeded;
 
@@ -209,8 +209,14 @@ 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>,
 }
 
@@ -286,6 +292,7 @@ impl InnerField {
         let mut pos = 0;
 
         let len = payload.buf.len();
+
         if len == 0 {
             return if payload.eof {
                 Poll::Ready(Some(Err(Error::Incomplete)))
@@ -296,7 +303,7 @@ impl InnerField {
 
         // check boundary
         if len > 4 && payload.buf[0] == b'\r' {
-            let b_len = if &payload.buf[..2] == b"\r\n" && &payload.buf[2..4] == b"--" {
+            let b_len = if payload.buf.starts_with(b"\r\n") && &payload.buf[2..4] == b"--" {
                 Some(4)
             } else if &payload.buf[1..3] == b"--" {
                 Some(3)
@@ -357,41 +364,42 @@ impl InnerField {
             return Poll::Ready(None);
         }
 
-        let result = if let Some(mut payload) = self
+        let Some(mut payload) = self
             .payload
             .as_ref()
             .expect("Field should not be polled after completion")
             .get_mut(safety)
-        {
-            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)
-                };
-
-                match res {
-                    Poll::Pending => return Poll::Pending,
-                    Poll::Ready(Some(Ok(bytes))) => return Poll::Ready(Some(Ok(bytes))),
-                    Poll::Ready(Some(Err(err))) => return Poll::Ready(Some(Err(err))),
-                    Poll::Ready(None) => self.eof = true,
-                }
-            }
-
-            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
+        else {
+            return Poll::Pending;
         };
 
+        if !self.eof {
+            let res = if let Some(ref mut len) = self.length {
+                Self::read_len(&mut payload, len)
+            } else {
+                Self::read_stream(&mut payload, &self.boundary)
+            };
+
+            match ready!(res) {
+                Some(Ok(bytes)) => return Poll::Ready(Some(Ok(bytes))),
+                Some(Err(err)) => return Poll::Ready(Some(Err(err))),
+                None => self.eof = true,
+            }
+        }
+
+        let result = match payload.readline() {
+            Ok(None) => Poll::Pending,
+            Ok(Some(line)) => {
+                if line.as_ref() != b"\r\n" {
+                    log::warn!("multipart field did not read all the data or it is malformed");
+                }
+                Poll::Ready(None)
+            }
+            Err(err) => Poll::Ready(Some(Err(err))),
+        };
+
+        drop(payload);
+
         if let Poll::Ready(None) = result {
             // drop payload buffer and make future un-poll-able
             let _ = self.payload.take();

actix-multipart/src/form/json.rs

@@ -3,7 +3,7 @@
 use std::sync::Arc;
 
 use actix_web::{http::StatusCode, web, Error, HttpRequest, ResponseError};
-use derive_more::{Deref, DerefMut, Display, Error};
+use derive_more::derive::{Deref, DerefMut, Display, Error};
 use futures_core::future::LocalBoxFuture;
 use serde::de::DeserializeOwned;
 
@@ -66,11 +66,11 @@ where
 #[non_exhaustive]
 pub enum JsonFieldError {
     /// Deserialize error.
-    #[display(fmt = "Json deserialize error: {}", _0)]
+    #[display("Json deserialize error: {}", _0)]
     Deserialize(serde_json::Error),
 
     /// Content type error.
-    #[display(fmt = "Content type error")]
+    #[display("Content type error")]
     ContentType,
 }
 

actix-multipart/src/form/mod.rs

@@ -1,4 +1,4 @@
-//! Process and extract typed data from a multipart stream.
+//! Extract and process typed data from fields of a `multipart/form-data` request.
 
 use std::{
     any::Any,
@@ -8,7 +8,7 @@ use std::{
 };
 
 use actix_web::{dev, error::PayloadError, web, Error, FromRequest, HttpRequest};
-use derive_more::{Deref, DerefMut};
+use derive_more::derive::{Deref, DerefMut};
 use futures_core::future::LocalBoxFuture;
 use futures_util::{TryFutureExt as _, TryStreamExt as _};
 

actix-multipart/src/form/tempfile.rs

@@ -7,7 +7,7 @@ use std::{
 };
 
 use actix_web::{http::StatusCode, web, Error, HttpRequest, ResponseError};
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 use futures_core::future::LocalBoxFuture;
 use futures_util::TryStreamExt as _;
 use mime::Mime;
@@ -82,7 +82,7 @@ impl<'t> FieldReader<'t> for TempFile {
 #[non_exhaustive]
 pub enum TempFileError {
     /// File I/O Error
-    #[display(fmt = "File I/O error: {}", _0)]
+    #[display("File I/O error: {}", _0)]
     FileIo(std::io::Error),
 }
 

actix-multipart/src/form/text.rs

@@ -3,7 +3,7 @@
 use std::{str, sync::Arc};
 
 use actix_web::{http::StatusCode, web, Error, HttpRequest, ResponseError};
-use derive_more::{Deref, DerefMut, Display, Error};
+use derive_more::derive::{Deref, DerefMut, Display, Error};
 use futures_core::future::LocalBoxFuture;
 use serde::de::DeserializeOwned;
 
@@ -77,15 +77,15 @@ where
 #[non_exhaustive]
 pub enum TextError {
     /// UTF-8 decoding error.
-    #[display(fmt = "UTF-8 decoding error: {}", _0)]
+    #[display("UTF-8 decoding error: {}", _0)]
     Utf8Error(str::Utf8Error),
 
     /// Deserialize error.
-    #[display(fmt = "Plain text deserialize error: {}", _0)]
+    #[display("Plain text deserialize error: {}", _0)]
     Deserialize(serde_plain::Error),
 
     /// Content type error.
-    #[display(fmt = "Content type error")]
+    #[display("Content type error")]
     ContentType,
 }
 

actix-multipart/src/lib.rs

@@ -1,4 +1,12 @@
-//! Multipart form support for Actix Web.
+//! Multipart request & form support for Actix Web.
+//!
+//! The [`Multipart`] extractor aims to support all kinds of `multipart/*` requests, including
+//! `multipart/form-data`, `multipart/related` and `multipart/mixed`. This is a lower-level
+//! extractor which supports reading [multipart fields](Field), in the order they are sent by the
+//! client.
+//!
+//! Due to additional requirements for `multipart/form-data` requests, the higher level
+//! [`MultipartForm`] extractor and derive macro only supports this media type.
 //!
 //! # Examples
 //!
@@ -45,6 +53,8 @@
 //!   -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::{future::lazy, stream, StreamExt as _};
+    use futures_util::{stream, StreamExt as _};
     use tokio::sync::mpsc;
     use tokio_stream::wrappers::UnboundedReceiverStream;
 
@@ -718,100 +718,6 @@ 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,7 +122,13 @@ impl PayloadBuffer {
         }
     }
 
-    /// Reads bytes until new line delimiter.
+    /// Reads bytes until new line delimiter (`\n`, `0x0A`).
+    ///
+    /// Returns:
+    ///
+    /// - `Ok(Some(chunk))` - `needle` is found, with chunk ending after needle
+    /// - `Err(Incomplete)` - `needle` is not found and we're at EOF
+    /// - `Ok(None)` - `needle` is not found otherwise
     #[inline]
     pub(crate) fn readline(&mut self) -> Result<Option<Bytes>, Error> {
         self.read_until(b"\n")
@@ -145,3 +151,105 @@ 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-router/Cargo.toml

@@ -38,6 +38,9 @@ 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,11 +511,6 @@ mod tests {
         value: String,
     }
 
-    #[derive(Deserialize)]
-    struct Id {
-        _id: String,
-    }
-
     #[derive(Debug, Deserialize)]
     struct Test1(String, u32);
 

actix-router/src/lib.rs

@@ -1,7 +1,5 @@
 //! 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 s) => Some(s),
-                    PathItem::Segment(s, e) => {
-                        Some(&self.path.path()[(*s as usize)..(*e as usize)])
+                    PathItem::Static(ref seg) => Some(seg),
+                    PathItem::Segment(start, end) => {
+                        Some(&self.path.path()[(*start as usize)..(*end as usize)])
                     }
                 };
             }
@@ -193,8 +193,10 @@ 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 s) => s,
-                PathItem::Segment(s, e) => &self.params.path.path()[(s as usize)..(e as usize)],
+                PathItem::Static(ref seg) => seg,
+                PathItem::Segment(start, end) => {
+                    &self.params.path.path()[(start as usize)..(end as usize)]
+                }
             };
             self.idx += 1;
             return Some((&self.params.segments[idx].0, res));
@@ -217,8 +219,8 @@ impl<T: ResourcePath> Index<usize> for Path<T> {
 
     fn index(&self, idx: usize) -> &str {
         match self.segments[idx].1 {
-            PathItem::Static(ref s) => s,
-            PathItem::Segment(s, e) => &self.path.path()[(s as usize)..(e as usize)],
+            PathItem::Static(ref seg) => seg,
+            PathItem::Segment(start, end) => &self.path.path()[(start as usize)..(end as usize)],
         }
     }
 }

actix-test/Cargo.toml

@@ -73,3 +73,6 @@ 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,8 +27,6 @@
 //! }
 //! ```
 
-#![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,7 +2,10 @@
 
 ## Unreleased
 
-- Take the encoded buffer when yielding bytes in the response stream rather than splitting the buffer, reducing memory use
+## 4.3.1 <!-- v4.3.1+deprecated -->
+
+- 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,13 +1,14 @@
 [package]
 name = "actix-web-actors"
-version = "4.3.0"
+version = "4.3.1+deprecated"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix actors support for Actix Web"
 keywords = ["actix", "http", "web", "framework", "async"]
-homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-web"
-license = "MIT OR Apache-2.0"
-edition = "2021"
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
 
 [package.metadata.cargo_check_external_types]
 allowed_external_types = [
@@ -41,3 +42,6 @@ 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,15 +1,17 @@
 # `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.0)](https://docs.rs/actix-web-actors/4.3.0)
+[![Documentation](https://docs.rs/actix-web-actors/badge.svg?version=4.3.1)](https://docs.rs/actix-web-actors/4.3.1)
 ![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
 ![License](https://img.shields.io/crates/l/actix-web-actors.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-web-actors/4.3.0/status.svg)](https://deps.rs/crate/actix-web-actors/4.3.0)
+![maintenance-status](https://img.shields.io/badge/maintenance-deprecated-red.svg)
 [![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,5 +1,7 @@
 //! Actix actors support for Actix Web.
 //!
+//! This crate is deprecated. Migrate to [`actix-ws`](https://crates.io/crates/actix-ws).
+//!
 //! # Examples
 //!
 //! ```no_run
@@ -55,8 +57,6 @@
 //! * [`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,11 +796,8 @@ where
             Some(frm) => {
                 let msg = match frm {
                     Frame::Text(data) => {
-                        Message::Text(ByteString::try_from(data).map_err(|e| {
-                            ProtocolError::Io(io::Error::new(
-                                io::ErrorKind::Other,
-                                format!("{}", e),
-                            ))
+                        Message::Text(ByteString::try_from(data).map_err(|err| {
+                            ProtocolError::Io(io::Error::new(io::ErrorKind::Other, err))
                         })?)
                     }
                     Frame::Binary(data) => Message::Binary(data),

actix-web-codegen/Cargo.toml

@@ -35,3 +35,6 @@ actix-web = "4"
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 trybuild = "1"
 rustversion = "1"
+
+[lints]
+workspace = true

actix-web-codegen/src/lib.rs

@@ -73,8 +73,6 @@
 //! [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

@@ -145,7 +145,7 @@ async fn custom_resource_name_test<'a>(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/CHANGES.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+- 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.8.0"
+version = "4.9.0"
 description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
@@ -146,11 +146,12 @@ bytes = "1"
 bytestring = "1"
 cfg-if = "1"
 cookie = { version = "0.16", features = ["percent-encode"], optional = true }
-derive_more = "0.99.8"
+derive_more = { version = "1", features = ["display", "error", "from"] }
 encoding_rs = "0.8"
 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"
@@ -181,13 +182,16 @@ futures-util = { version = "0.3.17", default-features = false, features = ["std"
 rand = "0.8"
 rcgen = "0.13"
 rustls-pemfile = "2"
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1", 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,10 +8,10 @@
 <!-- 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.8.0)](https://docs.rs/actix-web/4.8.0)
+[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.9.0)](https://docs.rs/actix-web/4.9.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.8.0/status.svg)](https://deps.rs/crate/actix-web/4.8.0)
+[![Dependency Status](https://deps.rs/crate/actix-web/4.9.0/status.svg)](https://deps.rs/crate/actix-web/4.9.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/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web)

actix-web/benches/responder.rs

@@ -2,11 +2,9 @@ use std::{future::Future, time::Instant};
 
 use actix_http::body::BoxBody;
 use actix_utils::future::{ready, Ready};
-use actix_web::{
-    error, http::StatusCode, test::TestRequest, Error, HttpRequest, HttpResponse, Responder,
-};
+use actix_web::{http::StatusCode, test::TestRequest, Error, HttpRequest, HttpResponse, Responder};
 use criterion::{criterion_group, criterion_main, Criterion};
-use futures_util::future::{join_all, Either};
+use futures_util::future::join_all;
 
 // responder simulate the old responder trait.
 trait FutureResponder {
@@ -16,9 +14,6 @@ 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);
 
@@ -34,22 +29,6 @@ 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;
 
@@ -60,17 +39,6 @@ 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/middleware_from_fn.rs

@@ -0,0 +1,127 @@
+//! 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(factory_ref.clone()),
+            endpoint: AppEntry::new(Rc::clone(&factory_ref)),
             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(|e| log::error!("Can not construct default service: {:?}", e));
+        let svc = svc.into_factory().map_init_err(|err| {
+            log::error!("Can not construct default service: {err:?}");
+        });
 
         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, default.clone());
+        let mut config = AppService::new(config, Rc::clone(&default));
 
         // 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: self.default.clone(),
+            default: Rc::clone(&self.default),
             services: Vec::new(),
             root: false,
         }
@@ -81,7 +81,7 @@ impl AppService {
 
     /// Returns default handler factory.
     pub fn default_service(&self) -> Rc<BoxedHttpServiceFactory> {
-        self.default.clone()
+        Rc::clone(&self.default)
     }
 
     /// 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(self.0.clone()));
+        extensions.insert(Data(Arc::clone(&self.0)));
         true
     }
 }

actix-web/src/error/mod.rs

@@ -6,7 +6,7 @@
 //
 // See <https://github.com/rust-lang/rust/issues/83375>
 pub use actix_http::error::{ContentTypeError, DispatchError, HttpError, ParseError, PayloadError};
-use derive_more::{Display, Error, From};
+use derive_more::derive::{Display, Error, From};
 use serde_json::error::Error as JsonError;
 use serde_urlencoded::{de::Error as FormDeError, ser::Error as FormError};
 use url::ParseError as UrlParseError;
@@ -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(fmt = "Blocking thread pool is shut down unexpectedly")]
+#[display("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(fmt = "Resource not found")]
+    #[display("Resource not found")]
     ResourceNotFound,
 
     /// Not all URL parameters covered.
-    #[display(fmt = "Not all URL parameters covered")]
+    #[display("Not all URL parameters covered")]
     NotEnoughElements,
 
     /// URL parse error.
-    #[display(fmt = "{}", _0)]
+    #[display("{}", _0)]
     ParseError(UrlParseError),
 }
 
@@ -59,39 +59,39 @@ impl ResponseError for UrlGenerationError {}
 #[non_exhaustive]
 pub enum UrlencodedError {
     /// Can not decode chunked transfer encoding.
-    #[display(fmt = "Can not decode chunked transfer encoding.")]
+    #[display("Can not decode chunked transfer encoding.")]
     Chunked,
 
     /// Payload size is larger than allowed. (default limit: 256kB).
     #[display(
-        fmt = "URL encoded payload is larger ({} bytes) than allowed (limit: {} bytes).",
+        "URL encoded payload is larger ({} bytes) than allowed (limit: {} bytes).",
         size,
         limit
     )]
     Overflow { size: usize, limit: usize },
 
     /// Payload size is now known.
-    #[display(fmt = "Payload size is now known.")]
+    #[display("Payload size is now known.")]
     UnknownLength,
 
     /// Content type error.
-    #[display(fmt = "Content type error.")]
+    #[display("Content type error.")]
     ContentType,
 
     /// Parse error.
-    #[display(fmt = "Parse error: {}.", _0)]
+    #[display("Parse error: {}.", _0)]
     Parse(FormDeError),
 
     /// Encoding error.
-    #[display(fmt = "Encoding error.")]
+    #[display("Encoding error.")]
     Encoding,
 
     /// Serialize error.
-    #[display(fmt = "Serialize error: {}.", _0)]
+    #[display("Serialize error: {}.", _0)]
     Serialize(FormError),
 
     /// Payload error.
-    #[display(fmt = "Error that occur during reading payload: {}.", _0)]
+    #[display("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(
-        fmt = "JSON payload ({} bytes) is larger than allowed (limit: {} bytes).",
+        "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(fmt = "JSON payload has exceeded limit ({} bytes).", limit)]
+    #[display("JSON payload has exceeded limit ({} bytes).", limit)]
     Overflow { limit: usize },
 
     /// Content type error
-    #[display(fmt = "Content type error")]
+    #[display("Content type error")]
     ContentType,
 
     /// Deserialize error
-    #[display(fmt = "Json deserialize error: {}", _0)]
+    #[display("Json deserialize error: {}", _0)]
     Deserialize(JsonError),
 
     /// Serialize error
-    #[display(fmt = "Json serialize error: {}", _0)]
+    #[display("Json serialize error: {}", _0)]
     Serialize(JsonError),
 
     /// Payload error
-    #[display(fmt = "Error that occur during reading payload: {}", _0)]
+    #[display("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(fmt = "Path deserialize error: {}", _0)]
+    #[display("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(fmt = "Query deserialize error: {}", _0)]
+    #[display("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(fmt = "Encoding error")]
+    #[display("Encoding error")]
     /// Payload size is bigger than allowed. (default: 256kB)
     EncodingError,
 
     /// Payload error.
-    #[display(fmt = "Error that occur during reading payload: {}", _0)]
+    #[display("Error that occur during reading payload: {}", _0)]
     Payload(PayloadError),
 
     /// Line limit exceeded.
-    #[display(fmt = "Line limit exceeded")]
+    #[display("Line limit exceeded")]
     LimitOverflow,
 
     /// ContentType error.
-    #[display(fmt = "Content-type error")]
+    #[display("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

actix-web/src/http/header/content_disposition.rs

@@ -493,7 +493,7 @@ impl Header for ContentDisposition {
     }
 
     fn parse<T: crate::HttpMessage>(msg: &T) -> Result<Self, crate::error::ParseError> {
-        if let Some(h) = msg.headers().get(&Self::name()) {
+        if let Some(h) = msg.headers().get(Self::name()) {
             Self::from_raw(h)
         } else {
             Err(crate::error::ParseError::Header)

actix-web/src/http/header/content_length.rs

@@ -1,6 +1,6 @@
 use std::{convert::Infallible, str};
 
-use derive_more::{Deref, DerefMut};
+use derive_more::derive::{Deref, DerefMut};
 
 use crate::{
     error::ParseError,

actix-web/src/http/header/range.rs

@@ -107,16 +107,16 @@ impl ByteRangeSpec {
     /// satisfiable if they meet the following conditions:
     ///
     /// > If a valid byte-range-set includes at least one byte-range-spec with a first-byte-pos that
-    /// is less than the current length of the representation, or at least one
-    /// suffix-byte-range-spec with a non-zero suffix-length, then the byte-range-set
-    /// is satisfiable. Otherwise, the byte-range-set is unsatisfiable.
+    /// > is less than the current length of the representation, or at least one
+    /// > suffix-byte-range-spec with a non-zero suffix-length, then the byte-range-set is
+    /// > satisfiable. Otherwise, the byte-range-set is unsatisfiable.
     ///
     /// The function also computes remainder ranges based on the RFC:
     ///
     /// > If the last-byte-pos value is absent, or if the value is greater than or equal to the
-    /// current length of the representation data, the byte range is interpreted as the remainder
-    /// of the representation (i.e., the server replaces the value of last-byte-pos with a value
-    /// that is one less than the current length of the selected representation).
+    /// > current length of the representation data, the byte range is interpreted as the remainder
+    /// > of the representation (i.e., the server replaces the value of last-byte-pos with a value
+    /// > that is one less than the current length of the selected representation).
     ///
     /// [RFC 7233 §2.1]: https://datatracker.ietf.org/doc/html/rfc7233
     pub fn to_satisfiable_range(&self, full_length: u64) -> Option<(u64, u64)> {
@@ -270,7 +270,7 @@ impl Header for Range {
 
     #[inline]
     fn parse<T: HttpMessage>(msg: &T) -> Result<Self, ParseError> {
-        header::from_one_raw_str(msg.headers().get(&Self::name()))
+        header::from_one_raw_str(msg.headers().get(Self::name()))
     }
 }
 

actix-web/src/info.rs

@@ -1,7 +1,7 @@
 use std::{convert::Infallible, net::SocketAddr};
 
 use actix_utils::future::{err, ok, Ready};
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
 
 use crate::{
     dev::{AppConfig, Payload, RequestHead},
@@ -235,7 +235,7 @@ impl FromRequest for ConnectionInfo {
 /// # let _svc = actix_web::web::to(handler);
 /// ```
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, Display)]
-#[display(fmt = "{}", _0)]
+#[display("{}", _0)]
 pub struct PeerAddr(pub SocketAddr);
 
 impl PeerAddr {
@@ -247,7 +247,7 @@ impl PeerAddr {
 
 #[derive(Debug, Display, Error)]
 #[non_exhaustive]
-#[display(fmt = "Missing peer address")]
+#[display("Missing peer address")]
 pub struct MissingPeerAddr;
 
 impl ResponseError for MissingPeerAddr {}

actix-web/src/lib.rs

@@ -70,8 +70,6 @@
 //! - `rustls-0_23` - HTTPS support via `rustls` 0.23 crate, supports `HTTP/2`
 //! - `secure-cookies` - secure cookies support
 
-#![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,6 +104,7 @@ mod scope;
 mod server;
 mod service;
 pub mod test;
+mod thin_data;
 pub(crate) mod types;
 pub mod web;
 

actix-web/src/middleware/default_headers.rs

@@ -141,7 +141,7 @@ where
     actix_service::forward_ready!(service);
 
     fn call(&self, req: ServiceRequest) -> Self::Future {
-        let inner = self.inner.clone();
+        let inner = Rc::clone(&self.inner);
         let fut = self.service.call(req);
 
         DefaultHeaderFuture {

actix-web/src/middleware/err_handlers.rs

@@ -220,16 +220,20 @@ impl<B> ErrorHandlers<B> {
     /// [`.handler()`][ErrorHandlers::handler]) will fall back on this.
     ///
     /// Note that this will overwrite any default handlers previously set by calling
-    /// [`.default_handler_client()`][ErrorHandlers::default_handler_client] or
-    /// [`.default_handler_server()`][ErrorHandlers::default_handler_server], but not any set by
-    /// calling [`.handler()`][ErrorHandlers::handler].
+    /// [`default_handler_client()`] or [`.default_handler_server()`], but not any set by calling
+    /// [`.handler()`].
+    ///
+    /// [`default_handler_client()`]: ErrorHandlers::default_handler_client
+    /// [`.default_handler_server()`]: ErrorHandlers::default_handler_server
+    /// [`.handler()`]: ErrorHandlers::handler
     pub fn default_handler<F>(self, handler: F) -> Self
     where
         F: Fn(ServiceResponse<B>) -> Result<ErrorHandlerResponse<B>> + 'static,
     {
         let handler = Rc::new(handler);
+        let handler2 = Rc::clone(&handler);
         Self {
-            default_server: Some(handler.clone()),
+            default_server: Some(handler2),
             default_client: Some(handler),
             ..self
         }
@@ -288,7 +292,7 @@ where
     type Future = LocalBoxFuture<'static, Result<Self::Transform, Self::InitError>>;
 
     fn new_transform(&self, service: S) -> Self::Future {
-        let handlers = self.handlers.clone();
+        let handlers = Rc::clone(&self.handlers);
         let default_client = self.default_client.clone();
         let default_server = self.default_server.clone();
         Box::pin(async move {
@@ -323,7 +327,7 @@ where
     actix_service::forward_ready!(service);
 
     fn call(&self, req: ServiceRequest) -> Self::Future {
-        let handlers = self.handlers.clone();
+        let handlers = Rc::clone(&self.handlers);
         let default_client = self.default_client.clone();
         let default_server = self.default_server.clone();
         let fut = self.service.call(req);

actix-web/src/middleware/from_fn.rs

@@ -0,0 +1,349 @@
+use std::{future::Future, marker::PhantomData, rc::Rc};
+
+use actix_service::boxed::{self, BoxFuture, RcService};
+use actix_utils::future::{ready, Ready};
+use futures_core::future::LocalBoxFuture;
+
+use crate::{
+    body::MessageBody,
+    dev::{forward_ready, Service, ServiceRequest, ServiceResponse, Transform},
+    Error, FromRequest,
+};
+
+/// Wraps an async function to be used as a middleware.
+///
+/// # Examples
+///
+/// The wrapped function should have the following form:
+///
+/// ```
+/// # use actix_web::{
+/// #     App, Error,
+/// #     body::MessageBody,
+/// #     dev::{ServiceRequest, ServiceResponse, Service as _},
+/// # };
+/// use actix_web::middleware::{self, Next};
+///
+/// async fn my_mw(
+///     req: ServiceRequest,
+///     next: Next<impl MessageBody>,
+/// ) -> Result<ServiceResponse<impl MessageBody>, Error> {
+///     // pre-processing
+///     next.call(req).await
+///     // post-processing
+/// }
+/// # App::new().wrap(middleware::from_fn(my_mw));
+/// ```
+///
+/// Then use in an app builder like this:
+///
+/// ```
+/// use actix_web::{
+///     App, Error,
+///     dev::{ServiceRequest, ServiceResponse, Service as _},
+/// };
+/// use actix_web::middleware::from_fn;
+/// # use actix_web::middleware::Next;
+/// # async fn my_mw<B>(req: ServiceRequest, next: Next<B>) -> Result<ServiceResponse<B>, Error> {
+/// #     next.call(req).await
+/// # }
+///
+/// App::new()
+///     .wrap(from_fn(my_mw))
+/// # ;
+/// ```
+///
+/// It is also possible to write a middleware that automatically uses extractors, similar to request
+/// handlers, by declaring them as the first parameters. As usual, **take care with extractors that
+/// consume the body stream**, since handlers will no longer be able to read it again without
+/// putting the body "back" into the request object within your middleware.
+///
+/// ```
+/// # use std::collections::HashMap;
+/// # use actix_web::{
+/// #     App, Error,
+/// #     body::MessageBody,
+/// #     dev::{ServiceRequest, ServiceResponse},
+/// #     http::header::{Accept, Date},
+/// #     web::{Header, Query},
+/// # };
+/// use actix_web::middleware::Next;
+///
+/// async fn my_extracting_mw(
+///     accept: Header<Accept>,
+///     query: Query<HashMap<String, String>>,
+///     req: ServiceRequest,
+///     next: Next<impl MessageBody>,
+/// ) -> Result<ServiceResponse<impl MessageBody>, Error> {
+///     // pre-processing
+///     next.call(req).await
+///     // post-processing
+/// }
+/// # App::new().wrap(actix_web::middleware::from_fn(my_extracting_mw));
+pub fn from_fn<F, Es>(mw_fn: F) -> MiddlewareFn<F, Es> {
+    MiddlewareFn {
+        mw_fn: Rc::new(mw_fn),
+        _phantom: PhantomData,
+    }
+}
+
+/// Middleware transform for [`from_fn`].
+#[allow(missing_debug_implementations)]
+pub struct MiddlewareFn<F, Es> {
+    mw_fn: Rc<F>,
+    _phantom: PhantomData<Es>,
+}
+
+impl<S, F, Fut, B, B2> Transform<S, ServiceRequest> for MiddlewareFn<F, ()>
+where
+    S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error> + 'static,
+    F: Fn(ServiceRequest, Next<B>) -> Fut + 'static,
+    Fut: Future<Output = Result<ServiceResponse<B2>, Error>>,
+    B2: MessageBody,
+{
+    type Response = ServiceResponse<B2>;
+    type Error = Error;
+    type Transform = MiddlewareFnService<F, B, ()>;
+    type InitError = ();
+    type Future = Ready<Result<Self::Transform, Self::InitError>>;
+
+    fn new_transform(&self, service: S) -> Self::Future {
+        ready(Ok(MiddlewareFnService {
+            service: boxed::rc_service(service),
+            mw_fn: Rc::clone(&self.mw_fn),
+            _phantom: PhantomData,
+        }))
+    }
+}
+
+/// Middleware service for [`from_fn`].
+#[allow(missing_debug_implementations)]
+pub struct MiddlewareFnService<F, B, Es> {
+    service: RcService<ServiceRequest, ServiceResponse<B>, Error>,
+    mw_fn: Rc<F>,
+    _phantom: PhantomData<(B, Es)>,
+}
+
+impl<F, Fut, B, B2> Service<ServiceRequest> for MiddlewareFnService<F, B, ()>
+where
+    F: Fn(ServiceRequest, Next<B>) -> Fut,
+    Fut: Future<Output = Result<ServiceResponse<B2>, Error>>,
+    B2: MessageBody,
+{
+    type Response = ServiceResponse<B2>;
+    type Error = Error;
+    type Future = Fut;
+
+    forward_ready!(service);
+
+    fn call(&self, req: ServiceRequest) -> Self::Future {
+        (self.mw_fn)(
+            req,
+            Next::<B> {
+                service: Rc::clone(&self.service),
+            },
+        )
+    }
+}
+
+macro_rules! impl_middleware_fn_service {
+    ($($ext_type:ident),*) => {
+        impl<S, F, Fut, B, B2, $($ext_type),*> Transform<S, ServiceRequest> for MiddlewareFn<F, ($($ext_type),*,)>
+        where
+            S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error> + 'static,
+            F: Fn($($ext_type),*, ServiceRequest, Next<B>) -> Fut + 'static,
+            $($ext_type: FromRequest + 'static,)*
+            Fut: Future<Output = Result<ServiceResponse<B2>, Error>> + 'static,
+            B: MessageBody + 'static,
+            B2: MessageBody + 'static,
+        {
+            type Response = ServiceResponse<B2>;
+            type Error = Error;
+            type Transform = MiddlewareFnService<F, B, ($($ext_type,)*)>;
+            type InitError = ();
+            type Future = Ready<Result<Self::Transform, Self::InitError>>;
+
+            fn new_transform(&self, service: S) -> Self::Future {
+                ready(Ok(MiddlewareFnService {
+                    service: boxed::rc_service(service),
+                    mw_fn: Rc::clone(&self.mw_fn),
+                    _phantom: PhantomData,
+                }))
+            }
+        }
+
+        impl<F, $($ext_type),*, Fut, B: 'static, B2> Service<ServiceRequest>
+            for MiddlewareFnService<F, B, ($($ext_type),*,)>
+        where
+            F: Fn(
+                $($ext_type),*,
+                ServiceRequest,
+                Next<B>
+            ) -> Fut + 'static,
+            $($ext_type: FromRequest + 'static,)*
+            Fut: Future<Output = Result<ServiceResponse<B2>, Error>> + 'static,
+            B2: MessageBody + 'static,
+        {
+            type Response = ServiceResponse<B2>;
+            type Error = Error;
+            type Future = LocalBoxFuture<'static, Result<Self::Response, Self::Error>>;
+
+            forward_ready!(service);
+
+            #[allow(nonstandard_style)]
+            fn call(&self, mut req: ServiceRequest) -> Self::Future {
+                let mw_fn = Rc::clone(&self.mw_fn);
+                let service = Rc::clone(&self.service);
+
+                Box::pin(async move {
+                    let ($($ext_type,)*) = req.extract::<($($ext_type,)*)>().await?;
+
+                    (mw_fn)($($ext_type),*, req, Next::<B> { service }).await
+                })
+            }
+        }
+    };
+}
+
+impl_middleware_fn_service!(E1);
+impl_middleware_fn_service!(E1, E2);
+impl_middleware_fn_service!(E1, E2, E3);
+impl_middleware_fn_service!(E1, E2, E3, E4);
+impl_middleware_fn_service!(E1, E2, E3, E4, E5);
+impl_middleware_fn_service!(E1, E2, E3, E4, E5, E6);
+impl_middleware_fn_service!(E1, E2, E3, E4, E5, E6, E7);
+impl_middleware_fn_service!(E1, E2, E3, E4, E5, E6, E7, E8);
+impl_middleware_fn_service!(E1, E2, E3, E4, E5, E6, E7, E8, E9);
+
+/// Wraps the "next" service in the middleware chain.
+#[allow(missing_debug_implementations)]
+pub struct Next<B> {
+    service: RcService<ServiceRequest, ServiceResponse<B>, Error>,
+}
+
+impl<B> Next<B> {
+    /// Equivalent to `Service::call(self, req)`.
+    pub fn call(&self, req: ServiceRequest) -> <Self as Service<ServiceRequest>>::Future {
+        Service::call(self, req)
+    }
+}
+
+impl<B> Service<ServiceRequest> for Next<B> {
+    type Response = ServiceResponse<B>;
+    type Error = Error;
+    type Future = BoxFuture<Result<Self::Response, Self::Error>>;
+
+    forward_ready!(service);
+
+    fn call(&self, req: ServiceRequest) -> Self::Future {
+        self.service.call(req)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{
+        http::header::{self, HeaderValue},
+        middleware::{Compat, Logger},
+        test, web, App, HttpResponse,
+    };
+
+    async fn noop<B>(req: ServiceRequest, next: Next<B>) -> Result<ServiceResponse<B>, Error> {
+        next.call(req).await
+    }
+
+    async fn add_res_header<B>(
+        req: ServiceRequest,
+        next: Next<B>,
+    ) -> Result<ServiceResponse<B>, Error> {
+        let mut res = next.call(req).await?;
+        res.headers_mut()
+            .insert(header::WARNING, HeaderValue::from_static("42"));
+        Ok(res)
+    }
+
+    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::<()>())
+    }
+
+    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_rt::test]
+    async fn compat_compat() {
+        let _ = App::new().wrap(Compat::new(from_fn(noop)));
+        let _ = App::new().wrap(Compat::new(from_fn(mutate_body_type)));
+    }
+
+    #[actix_rt::test]
+    async fn permits_different_in_and_out_body_types() {
+        let app = test::init_service(
+            App::new()
+                .wrap(from_fn(mutate_body_type))
+                .wrap(from_fn(add_res_header))
+                .wrap(Logger::default())
+                .wrap(from_fn(noop))
+                .default_service(web::to(HttpResponse::NotFound)),
+        )
+        .await;
+
+        let req = test::TestRequest::default().to_request();
+        let res = test::call_service(&app, req).await;
+        assert!(res.headers().contains_key(header::WARNING));
+    }
+
+    #[actix_rt::test]
+    async fn closure_capture_and_return_from_fn() {
+        let app = test::init_service(
+            App::new()
+                .wrap(Logger::default())
+                .wrap(MyMw(true).into_middleware())
+                .wrap(Logger::default()),
+        )
+        .await;
+
+        let req = test::TestRequest::default().to_request();
+        let res = test::call_service(&app, req).await;
+        assert!(res.headers().contains_key(header::WARNING));
+    }
+}

actix-web/src/middleware/logger.rs

@@ -276,7 +276,7 @@ where
 
         ready(Ok(LoggerMiddleware {
             service,
-            inner: self.0.clone(),
+            inner: Rc::clone(&self.0),
         }))
     }
 }
@@ -622,11 +622,7 @@ impl FormatText {
 
             FormatText::ResponseHeader(ref name) => {
                 let s = if let Some(val) = res.headers().get(name) {
-                    if let Ok(s) = val.to_str() {
-                        s
-                    } else {
-                        "-"
-                    }
+                    val.to_str().unwrap_or("-")
                 } else {
                     "-"
                 };
@@ -670,11 +666,7 @@ impl FormatText {
             FormatText::RequestTime => *self = FormatText::Str(now.format(&Rfc3339).unwrap()),
             FormatText::RequestHeader(ref name) => {
                 let s = if let Some(val) = req.headers().get(name) {
-                    if let Ok(s) = val.to_str() {
-                        s
-                    } else {
-                        "-"
-                    }
+                    val.to_str().unwrap_or("-")
                 } else {
                     "-"
                 };

actix-web/src/middleware/mod.rs

@@ -15,10 +15,47 @@
 //! - Access external services (e.g., [sessions](https://docs.rs/actix-session), etc.)
 //!
 //! Middleware is registered for each [`App`], [`Scope`](crate::Scope), or
-//! [`Resource`](crate::Resource) and executed in opposite order as registration. In general, a
-//! middleware is a pair of types that implements the [`Service`] trait and [`Transform`] trait,
-//! respectively. The [`new_transform`] and [`call`] methods must return a [`Future`], though it
-//! can often be [an immediately-ready one](actix_utils::future::Ready).
+//! [`Resource`](crate::Resource) and executed in opposite order as registration.
+//!
+//! # Simple Middleware
+//!
+//! In many cases, you can model your middleware as an async function via the [`from_fn()`] helper
+//! that provides a natural interface for implementing your desired behaviors.
+//!
+//! ```
+//! # use actix_web::{
+//! #     App, Error,
+//! #     body::MessageBody,
+//! #     dev::{ServiceRequest, ServiceResponse, Service as _},
+//! # };
+//! use actix_web::middleware::{self, Next};
+//!
+//! async fn my_mw(
+//!     req: ServiceRequest,
+//!     next: Next<impl MessageBody>,
+//! ) -> Result<ServiceResponse<impl MessageBody>, Error> {
+//!     // pre-processing
+//!
+//!     // invoke the wrapped middleware or service
+//!     let res = next.call(req).await?;
+//!
+//!     // post-processing
+//!
+//!     Ok(res)
+//! }
+//!
+//! App::new()
+//!     .wrap(middleware::from_fn(my_mw));
+//! ```
+//!
+//! ## Complex Middleware
+//!
+//! In the more general ase, a middleware is a pair of types that implements the [`Service`] trait
+//! and [`Transform`] trait, respectively. The [`new_transform`] and [`call`] methods must return a
+//! [`Future`], though it can often be [an immediately-ready one](actix_utils::future::Ready).
+//!
+//! All the built-in middleware use this pattern with pairs of builder (`Transform`) +
+//! implementation (`Service`) types.
 //!
 //! # Ordering
 //!
@@ -67,7 +104,7 @@
 //!                   Response
 //! ```
 //! The request _first_ gets processed by the middleware specified _last_ - `MiddlewareC`. It passes
-//! the request (modified a modified one) to the next middleware - `MiddlewareB` - _or_ directly
+//! the request (possibly a modified one) to the next middleware - `MiddlewareB` - _or_ directly
 //! responds to the request (e.g. when the request was invalid or an error occurred). `MiddlewareB`
 //! processes the request as well and passes it to `MiddlewareA`, which then passes it to the
 //! [`Service`]. In the [`Service`], the extractors will run first. They don't pass the request on,
@@ -196,18 +233,6 @@
 //! # }
 //! ```
 //!
-//! # Simpler Middleware
-//!
-//! In many cases, you _can_ actually use an async function via a helper that will provide a more
-//! natural flow for your behavior.
-//!
-//! The experimental `actix_web_lab` crate provides a [`from_fn`][lab_from_fn] utility which allows
-//! an async fn to be wrapped and used in the same way as other middleware. See the
-//! [`from_fn`][lab_from_fn] docs for more info and examples of it's use.
-//!
-//! While [`from_fn`][lab_from_fn] is experimental currently, it's likely this helper will graduate
-//! to Actix Web in some form, so feedback is appreciated.
-//!
 //! [`Future`]: std::future::Future
 //! [`App`]: crate::App
 //! [`FromRequest`]: crate::FromRequest
@@ -215,7 +240,7 @@
 //! [`Transform`]: crate::dev::Transform
 //! [`call`]: crate::dev::Service::call()
 //! [`new_transform`]: crate::dev::Transform::new_transform()
-//! [lab_from_fn]: https://docs.rs/actix-web-lab/latest/actix_web_lab/middleware/fn.from_fn.html
+//! [`from_fn`]: crate
 
 mod compat;
 #[cfg(feature = "__compress")]
@@ -223,6 +248,7 @@ mod compress;
 mod condition;
 mod default_headers;
 mod err_handlers;
+mod from_fn;
 mod identity;
 mod logger;
 mod normalize;
@@ -234,6 +260,7 @@ pub use self::{
     condition::Condition,
     default_headers::DefaultHeaders,
     err_handlers::{ErrorHandlerResponse, ErrorHandlers},
+    from_fn::{from_fn, Next},
     identity::Identity,
     logger::Logger,
     normalize::{NormalizePath, TrailingSlash},

actix-web/src/resource.rs

@@ -62,14 +62,14 @@ pub struct Resource<T = ResourceEndpoint> {
 impl Resource {
     /// Constructs new resource that matches a `path` pattern.
     pub fn new<T: IntoPatterns>(path: T) -> Resource {
-        let fref = Rc::new(RefCell::new(None));
+        let factory_ref = Rc::new(RefCell::new(None));
 
         Resource {
             routes: Vec::new(),
             rdef: path.patterns(),
             name: None,
-            endpoint: ResourceEndpoint::new(fref.clone()),
-            factory_ref: fref,
+            endpoint: ResourceEndpoint::new(Rc::clone(&factory_ref)),
+            factory_ref,
             guards: Vec::new(),
             app_data: None,
             default: boxed::factory(fn_service(|req: ServiceRequest| async {
@@ -358,10 +358,9 @@ where
         U::InitError: fmt::Debug,
     {
         // create and configure default resource
-        self.default = boxed::factory(
-            f.into_factory()
-                .map_init_err(|e| log::error!("Can not construct default service: {:?}", e)),
-        );
+        self.default = boxed::factory(f.into_factory().map_init_err(|err| {
+            log::error!("Can not construct default service: {err:?}");
+        }));
 
         self
     }

actix-web/src/response/builder.rs

@@ -463,7 +463,7 @@ mod tests {
         // content type override
         let res = HttpResponse::Ok()
             .insert_header((CONTENT_TYPE, "text/json"))
-            .json(&vec!["v1", "v2", "v3"]);
+            .json(["v1", "v2", "v3"]);
         let ct = res.headers().get(CONTENT_TYPE).unwrap();
         assert_eq!(ct, HeaderValue::from_static("text/json"));
         assert_body_eq!(res, br#"["v1","v2","v3"]"#);

actix-web/src/route.rs

@@ -77,7 +77,7 @@ impl ServiceFactory<ServiceRequest> for Route {
 
     fn new_service(&self, _: ()) -> Self::Future {
         let fut = self.service.new_service(());
-        let guards = self.guards.clone();
+        let guards = Rc::clone(&self.guards);
 
         Box::pin(async move {
             let service = fut.await?;

actix-web/src/scope.rs

@@ -278,7 +278,9 @@ where
     {
         // create and configure default resource
         self.default = Some(Rc::new(boxed::factory(f.into_factory().map_init_err(
-            |e| log::error!("Can not construct default service: {:?}", e),
+            |err| {
+                log::error!("Can not construct default service: {err:?}");
+            },
         ))));
 
         self

actix-web/src/server.rs

@@ -510,7 +510,7 @@ where
     /// No changes are made to `lst`'s configuration. Ensure it is configured properly before
     /// passing ownership to `listen()`.
     pub fn listen(mut self, lst: net::TcpListener) -> io::Result<Self> {
-        let cfg = self.config.clone();
+        let cfg = Arc::clone(&self.config);
         let factory = self.factory.clone();
         let addr = lst.local_addr().unwrap();
 
@@ -554,7 +554,7 @@ where
     /// Binds to existing listener for accepting incoming plaintext HTTP/1.x or HTTP/2 connections.
     #[cfg(feature = "http2")]
     pub fn listen_auto_h2c(mut self, lst: net::TcpListener) -> io::Result<Self> {
-        let cfg = self.config.clone();
+        let cfg = Arc::clone(&self.config);
         let factory = self.factory.clone();
         let addr = lst.local_addr().unwrap();
 
@@ -632,7 +632,7 @@ where
         config: actix_tls::accept::rustls_0_20::reexports::ServerConfig,
     ) -> io::Result<Self> {
         let factory = self.factory.clone();
-        let cfg = self.config.clone();
+        let cfg = Arc::clone(&self.config);
         let addr = lst.local_addr().unwrap();
         self.sockets.push(Socket {
             addr,
@@ -683,7 +683,7 @@ where
         config: actix_tls::accept::rustls_0_21::reexports::ServerConfig,
     ) -> io::Result<Self> {
         let factory = self.factory.clone();
-        let cfg = self.config.clone();
+        let cfg = Arc::clone(&self.config);
         let addr = lst.local_addr().unwrap();
         self.sockets.push(Socket {
             addr,
@@ -749,7 +749,7 @@ where
         config: actix_tls::accept::rustls_0_22::reexports::ServerConfig,
     ) -> io::Result<Self> {
         let factory = self.factory.clone();
-        let cfg = self.config.clone();
+        let cfg = Arc::clone(&self.config);
         let addr = lst.local_addr().unwrap();
         self.sockets.push(Socket {
             addr,
@@ -815,7 +815,7 @@ where
         config: actix_tls::accept::rustls_0_23::reexports::ServerConfig,
     ) -> io::Result<Self> {
         let factory = self.factory.clone();
-        let cfg = self.config.clone();
+        let cfg = Arc::clone(&self.config);
         let addr = lst.local_addr().unwrap();
         self.sockets.push(Socket {
             addr,
@@ -880,7 +880,7 @@ where
         acceptor: SslAcceptor,
     ) -> io::Result<Self> {
         let factory = self.factory.clone();
-        let cfg = self.config.clone();
+        let cfg = Arc::clone(&self.config);
         let addr = lst.local_addr().unwrap();
         self.sockets.push(Socket {
             addr,
@@ -937,7 +937,7 @@ where
         use actix_rt::net::UnixStream;
         use actix_service::{fn_service, ServiceFactoryExt as _};
 
-        let cfg = self.config.clone();
+        let cfg = Arc::clone(&self.config);
         let factory = self.factory.clone();
         let socket_addr =
             net::SocketAddr::new(net::IpAddr::V4(net::Ipv4Addr::new(127, 0, 0, 1)), 8080);
@@ -982,7 +982,7 @@ where
         use actix_rt::net::UnixStream;
         use actix_service::{fn_service, ServiceFactoryExt as _};
 
-        let cfg = self.config.clone();
+        let cfg = Arc::clone(&self.config);
         let factory = self.factory.clone();
         let socket_addr =
             net::SocketAddr::new(net::IpAddr::V4(net::Ipv4Addr::new(127, 0, 0, 1)), 8080);

actix-web/src/test/mod.rs

@@ -1,6 +1,6 @@
 //! Various helpers for Actix applications to use during testing.
 //!
-//! # Creating A Test Service
+//! # Initializing A Test Service
 //! - [`init_service`]
 //!
 //! # Off-The-Shelf Test Services
@@ -49,6 +49,7 @@ pub use self::{
 /// Must be used inside an async test. Works for both `ServiceRequest` and `HttpRequest`.
 ///
 /// # Examples
+///
 /// ```
 /// use actix_web::{http::StatusCode, HttpResponse};
 ///