Merge 243ddd71ed into afd53045d4

Bumps [taiki-e/cache-cargo-install-action](https://github.com/taiki-e/cache-cargo-install-action) from 2.3.1 to 3.0.0.
- [Release notes](https://github.com/taiki-e/cache-cargo-install-action/releases)
- [Changelog](https://github.com/taiki-e/cache-cargo-install-action/blob/main/CHANGELOG.md)
- [Commits](7447f04c51...25ef989260)

---
updated-dependencies:
- dependency-name: taiki-e/cache-cargo-install-action
  dependency-version: 3.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

.github/workflows/bench.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Install Rust
         run: |

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

@@ -28,7 +28,7 @@ jobs:
     runs-on: ${{ matrix.target.os }}
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Install nasm
         if: matrix.target.os == 'windows-latest'
@@ -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@0be4756f42223b67aa4b7df5effad59010cbf4b9 # v2.62.51
+        uses: taiki-e/install-action@cc33365ec7e3350bc47bf935f247582cc6f68344 # v2.65.12
         with:
           tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
 
@@ -71,7 +71,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Free Disk Space
         run: ./scripts/free-disk-space.sh
@@ -83,7 +83,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
 
       - name: Install just, cargo-hack
-        uses: taiki-e/install-action@0be4756f42223b67aa4b7df5effad59010cbf4b9 # v2.62.51
+        uses: taiki-e/install-action@cc33365ec7e3350bc47bf935f247582cc6f68344 # v2.65.12
         with:
           tool: just,cargo-hack
 

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
     runs-on: ${{ matrix.target.os }}
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Install nasm
         if: matrix.target.os == 'windows-latest'
@@ -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@0be4756f42223b67aa4b7df5effad59010cbf4b9 # v2.62.51
+        uses: taiki-e/install-action@cc33365ec7e3350bc47bf935f247582cc6f68344 # v2.65.12
         with:
           tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
 
@@ -87,13 +87,13 @@ jobs:
 
       - name: deny check
         if: matrix.version.name == 'stable' && matrix.target.os == 'ubuntu-latest'
-        uses: EmbarkStudios/cargo-deny-action@f2ba7abc2abebaf185c833c3961145a3c275caad # v2.0.13
+        uses: EmbarkStudios/cargo-deny-action@76cd80eb775d7bbbd2d80292136d74d39e1b4918 # v2.0.14
 
   io-uring:
     name: io-uring tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
@@ -109,7 +109,7 @@ jobs:
     name: doc tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Install Rust (nightly)
         uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
@@ -117,7 +117,7 @@ jobs:
           toolchain: nightly
 
       - name: Install just
-        uses: taiki-e/install-action@0be4756f42223b67aa4b7df5effad59010cbf4b9 # v2.62.51
+        uses: taiki-e/install-action@cc33365ec7e3350bc47bf935f247582cc6f68344 # v2.65.12
         with:
           tool: just
 

.github/workflows/coverage.yml

@@ -15,7 +15,7 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Install Rust (nightly)
         uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
@@ -24,7 +24,7 @@ jobs:
           components: llvm-tools
 
       - name: Install just, cargo-llvm-cov, cargo-nextest
-        uses: taiki-e/install-action@0be4756f42223b67aa4b7df5effad59010cbf4b9 # v2.62.51
+        uses: taiki-e/install-action@cc33365ec7e3350bc47bf935f247582cc6f68344 # v2.65.12
         with:
           tool: just,cargo-llvm-cov,cargo-nextest
 
@@ -32,7 +32,7 @@ jobs:
         run: just test-coverage-codecov
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
         with:
           files: codecov.json
           fail_ci_if_error: true

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Install Rust (nightly)
         uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
@@ -33,7 +33,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
@@ -52,7 +52,7 @@ jobs:
   lint-docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Install Rust (nightly)
         uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
@@ -69,7 +69,7 @@ jobs:
     if: false # rustdoc mismatch currently
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Install Rust (${{ vars.RUST_VERSION_EXTERNAL_TYPES }})
         uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
@@ -77,12 +77,12 @@ jobs:
           toolchain: ${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
 
       - name: Install just
-        uses: taiki-e/install-action@0be4756f42223b67aa4b7df5effad59010cbf4b9 # v2.62.51
+        uses: taiki-e/install-action@cc33365ec7e3350bc47bf935f247582cc6f68344 # v2.65.12
         with:
           tool: just
 
       - name: Install cargo-check-external-types
-        uses: taiki-e/cache-cargo-install-action@7447f04c51f2ba27ca35e7f1e28fab848c5b3ba7 # v2.3.1
+        uses: taiki-e/cache-cargo-install-action@25ef9892608d184944df486ae09ffae168b3cda3 # v3.0.0
         with:
           tool: cargo-check-external-types
 

Cargo.toml

@@ -19,7 +19,7 @@ homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-web"
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.75"
+rust-version = "1.82"
 
 [profile.dev]
 # Disabling debug info speeds up builds a bunch and we don't rely on it for debugging that much.

actix-files/CHANGES.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+- Minimum supported Rust version (MSRV) is now 1.82.
+
+## 0.6.9
+
+- Correct `derive_more` dependency feature requirements.
+
 ## 0.6.8
 
 - Add `Files::with_permanent_redirect()` method.

actix-files/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-files"
-version = "0.6.8"
+version = "0.6.9"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
 description = "Static file serving for Actix Web"
 keywords = ["actix", "http", "async", "futures"]
@@ -24,7 +24,7 @@ actix-web = { version = "4", default-features = false }
 
 bitflags = "2"
 bytes = "1"
-derive_more = { version = "2", features = ["display", "error", "from"] }
+derive_more = { version = "2", features = ["deref", "deref_mut", "display", "error", "from"] }
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 http-range = "0.1.4"
 log = "0.4"
@@ -37,7 +37,7 @@ v_htmlescape = "0.15.5"
 # experimental-io-uring
 [target.'cfg(target_os = "linux")'.dependencies]
 tokio-uring = { version = "0.5", optional = true, features = ["bytes"] }
-actix-server = { version = "2.4", optional = true }                      # ensure matching tokio-uring versions
+actix-server = { version = "2.4", optional = true } # ensure matching tokio-uring versions
 
 [dev-dependencies]
 actix-rt = "2.7"

actix-files/README.md

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

actix-files/src/range.rs

@@ -294,16 +294,11 @@ mod tests {
 
             let res = HttpRange::parse(header, size);
 
-            if res.is_err() {
+            if let Err(err) = res {
                 if expected.is_empty() {
                     continue;
                 } else {
-                    panic!(
-                        "parse({}, {}) returned error {:?}",
-                        header,
-                        size,
-                        res.unwrap_err()
-                    );
+                    panic!("parse({header}, {size}) returned error {err:?}");
                 }
             }
 

actix-http-test/CHANGES.md

@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.72.
+- Minimum supported Rust version (MSRV) is now 1.82.
 
 ## 3.2.0
 

actix-http/CHANGES.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Minimum supported Rust version (MSRV) is now 1.82.
+
 ## 3.11.2
 
 - Properly wake Payload receivers when feeding errors or EOF.

actix-http/Cargo.toml

@@ -149,7 +149,7 @@ memchr = "2.4"
 once_cell = "1.21"
 rcgen = "0.13"
 regex = "1.3"
-rustls-pemfile = "2"
+rustls-pki-types = "1.13.1"
 rustversion = "1"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1.0"

actix-http/examples/tls_rustls.rs

@@ -45,25 +45,14 @@ async fn main() -> io::Result<()> {
 fn rustls_config() -> rustls::ServerConfig {
     let rcgen::CertifiedKey { cert, key_pair } =
         rcgen::generate_simple_self_signed(["localhost".to_owned()]).unwrap();
-    let cert_file = cert.pem();
-    let key_file = key_pair.serialize_pem();
-
-    let cert_file = &mut io::BufReader::new(cert_file.as_bytes());
-    let key_file = &mut io::BufReader::new(key_file.as_bytes());
-
-    let cert_chain = rustls_pemfile::certs(cert_file)
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap();
-    let mut keys = rustls_pemfile::pkcs8_private_keys(key_file)
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap();
+    let cert_chain = vec![cert.der().clone()];
+    let key_der = rustls_pki_types::PrivateKeyDer::Pkcs8(
+        rustls_pki_types::PrivatePkcs8KeyDer::from(key_pair.serialize_der()),
+    );
 
     let mut config = rustls::ServerConfig::builder()
         .with_no_client_auth()
-        .with_single_cert(
-            cert_chain,
-            rustls::pki_types::PrivateKeyDer::Pkcs8(keys.remove(0)),
-        )
+        .with_single_cert(cert_chain, key_der)
         .unwrap();
 
     const H1_ALPN: &[u8] = b"http/1.1";

actix-http/examples/ws.rs

@@ -82,29 +82,16 @@ impl Stream for Heartbeat {
 }
 
 fn tls_config() -> rustls::ServerConfig {
-    use std::io::BufReader;
-
-    use rustls_pemfile::{certs, pkcs8_private_keys};
-
     let rcgen::CertifiedKey { cert, key_pair } =
         rcgen::generate_simple_self_signed(["localhost".to_owned()]).unwrap();
-    let cert_file = cert.pem();
-    let key_file = key_pair.serialize_pem();
-
-    let cert_file = &mut BufReader::new(cert_file.as_bytes());
-    let key_file = &mut BufReader::new(key_file.as_bytes());
-
-    let cert_chain = certs(cert_file).collect::<Result<Vec<_>, _>>().unwrap();
-    let mut keys = pkcs8_private_keys(key_file)
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap();
+    let cert_chain = vec![cert.der().clone()];
+    let key_der = rustls_pki_types::PrivateKeyDer::Pkcs8(
+        rustls_pki_types::PrivatePkcs8KeyDer::from(key_pair.serialize_der()),
+    );
 
     let mut config = rustls::ServerConfig::builder()
         .with_no_client_auth()
-        .with_single_cert(
-            cert_chain,
-            rustls::pki_types::PrivateKeyDer::Pkcs8(keys.remove(0)),
-        )
+        .with_single_cert(cert_chain, key_der)
         .unwrap();
 
     config.alpn_protocols.push(b"http/1.1".to_vec());

actix-http/src/h1/payload.rs

@@ -176,11 +176,7 @@ impl Inner {
     /// Register future waiting data from payload.
     /// Waker would be used in `Inner::wake`
     fn register(&mut self, cx: &Context<'_>) {
-        if self
-            .task
-            .as_ref()
-            .map_or(true, |w| !cx.waker().will_wake(w))
-        {
+        if self.task.as_ref().is_none_or(|w| !cx.waker().will_wake(w)) {
             self.task = Some(cx.waker().clone());
         }
     }
@@ -191,7 +187,7 @@ impl Inner {
         if self
             .io_task
             .as_ref()
-            .map_or(true, |w| !cx.waker().will_wake(w))
+            .is_none_or(|w| !cx.waker().will_wake(w))
         {
             self.io_task = Some(cx.waker().clone());
         }

actix-http/tests/test_rustls.rs

@@ -4,7 +4,7 @@ extern crate tls_rustls_023 as rustls;
 
 use std::{
     convert::Infallible,
-    io::{self, BufReader, Write},
+    io::{self, Write},
     net::{SocketAddr, TcpStream as StdTcpStream},
     sync::Arc,
     task::Poll,
@@ -27,7 +27,7 @@ use derive_more::{Display, Error};
 use futures_core::{ready, Stream};
 use futures_util::stream::once;
 use rustls::{pki_types::ServerName, ServerConfig as RustlsServerConfig};
-use rustls_pemfile::{certs, pkcs8_private_keys};
+use rustls_pki_types::{PrivateKeyDer, PrivatePkcs8KeyDer};
 
 async fn load_body<S>(stream: S) -> Result<BytesMut, PayloadError>
 where
@@ -54,23 +54,12 @@ where
 fn tls_config() -> RustlsServerConfig {
     let rcgen::CertifiedKey { cert, key_pair } =
         rcgen::generate_simple_self_signed(["localhost".to_owned()]).unwrap();
-    let cert_file = cert.pem();
-    let key_file = key_pair.serialize_pem();
-
-    let cert_file = &mut BufReader::new(cert_file.as_bytes());
-    let key_file = &mut BufReader::new(key_file.as_bytes());
-
-    let cert_chain = certs(cert_file).collect::<Result<Vec<_>, _>>().unwrap();
-    let mut keys = pkcs8_private_keys(key_file)
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap();
+    let cert_chain = vec![cert.der().clone()];
+    let key_der = PrivateKeyDer::Pkcs8(PrivatePkcs8KeyDer::from(key_pair.serialize_der()));
 
     let mut config = RustlsServerConfig::builder()
         .with_no_client_auth()
-        .with_single_cert(
-            cert_chain,
-            rustls::pki_types::PrivateKeyDer::Pkcs8(keys.remove(0)),
-        )
+        .with_single_cert(cert_chain, key_der)
         .unwrap();
 
     config.alpn_protocols.push(HTTP1_1_ALPN_PROTOCOL.to_vec());

actix-multipart-derive/CHANGES.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Minimum supported Rust version (MSRV) is now 1.82.
+
 ## 0.7.0
 
 - Minimum supported Rust version (MSRV) is now 1.72.

actix-multipart-derive/src/lib.rs

@@ -16,19 +16,14 @@ use proc_macro2::Ident;
 use quote::quote;
 use syn::{parse_macro_input, Type};
 
-#[derive(FromMeta)]
+#[derive(Default, FromMeta)]
 enum DuplicateField {
+    #[default]
     Ignore,
     Deny,
     Replace,
 }
 
-impl Default for DuplicateField {
-    fn default() -> Self {
-        Self::Ignore
-    }
-}
-
 #[derive(FromDeriveInput, Default)]
 #[darling(attributes(multipart), default)]
 struct MultipartFormAttrs {

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

@@ -1,10 +1,10 @@
-error: Could not parse size limit `2 bytes`: couldn't parse "bytes" into a known SI unit, couldn't parse unit of "bytes"
+error: Could not parse size limit `2 bytes`: couldn't parse "bytes" into a known SI unit, Failed to parse unit "byt..."
  --> tests/trybuild/size-limit-parse-fail.rs:6:5
   |
 6 |     description: Text<String>,
   |     ^^^^^^^^^^^
 
-error: Could not parse size limit `2 megabytes`: couldn't parse "megabytes" into a known SI unit, couldn't parse unit of "megabytes"
+error: Could not parse size limit `2 megabytes`: couldn't parse "megabytes" into a known SI unit, Failed to parse unit "meg..."
   --> tests/trybuild/size-limit-parse-fail.rs:12:5
    |
 12 |     description: Text<String>,

actix-multipart/CHANGES.md

@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.75.
+- Minimum supported Rust version (MSRV) is now 1.82.
 
 ## 0.7.2
 

actix-router/CHANGES.md

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

actix-test/CHANGES.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Minimum supported Rust version (MSRV) is now 1.82.
+
 ## 0.1.5
 
 - Add `TestServerConfig::listen_address()` method.

actix-web-actors/CHANGES.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Minimum supported Rust version (MSRV) is now 1.82.
+
 ## 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.

actix-web-actors/tests/test_ws.rs

@@ -52,6 +52,10 @@ async fn common_test_code(mut srv: actix_test::TestServer, frame_size: usize) {
         .unwrap();
     let item = framed.next().await.unwrap().unwrap();
     assert_eq!(item, ws::Frame::Close(Some(ws::CloseCode::Normal.into())));
+
+    let nothing = actix_rt::time::timeout(std::time::Duration::from_secs(1), framed.next()).await;
+    assert_eq!(true, nothing.is_ok());
+    assert_eq!(true, nothing.unwrap().is_none());
 }
 
 #[actix_rt::test]

actix-web-actors/tests/test_ws_close.rs

@@ -0,0 +1,96 @@
+use actix::prelude::*;
+use actix_web::{web, App, HttpRequest};
+use actix_web_actors::ws;
+use futures_util::{SinkExt as _, StreamExt as _};
+use tokio::sync::mpsc::Sender;
+
+struct Ws {
+    finished: Sender<()>,
+}
+
+impl Actor for Ws {
+    type Context = ws::WebsocketContext<Self>;
+}
+
+impl StreamHandler<Result<ws::Message, ws::ProtocolError>> for Ws {
+    fn handle(&mut self, msg: Result<ws::Message, ws::ProtocolError>, ctx: &mut Self::Context) {
+        match msg {
+            Ok(ws::Message::Close(reason)) => ctx.close(reason),
+            _ => ctx.close(Some(ws::CloseCode::Normal.into())),
+        }
+    }
+
+    fn finished(&mut self, _ctx: &mut Self::Context) {
+        _ = self.finished.try_send(()).unwrap();
+    }
+}
+
+#[actix_rt::test]
+async fn close_initiated_by_client() {
+    let (tx, mut finished) = tokio::sync::mpsc::channel(1);
+    let mut srv = actix_test::start(move || {
+        let tx = tx.clone();
+        App::new().service(web::resource("{anything:.*}").to(
+            move |req: HttpRequest, stream: web::Payload| {
+                let tx: Sender<()> = tx.clone();
+                async move { ws::WsResponseBuilder::new(Ws { finished: tx }, &req, stream).start() }
+            },
+        ))
+    });
+
+    let mut framed = srv.ws().await.unwrap();
+
+    framed
+        .send(ws::Message::Close(Some(ws::CloseCode::Normal.into())))
+        .await
+        .unwrap();
+    let item = framed.next().await.unwrap().unwrap();
+    assert_eq!(item, ws::Frame::Close(Some(ws::CloseCode::Normal.into())));
+
+    let nothing = actix_rt::time::timeout(std::time::Duration::from_secs(1), framed.next()).await;
+    assert_eq!(true, nothing.is_ok());
+    assert_eq!(true, nothing.unwrap().is_none());
+
+    let finished =
+        actix_rt::time::timeout(std::time::Duration::from_secs(1), finished.recv()).await;
+    assert_eq!(true, finished.is_ok());
+    assert_eq!(Some(()), finished.unwrap());
+}
+
+#[actix_rt::test]
+async fn close_initiated_by_server() {
+    let (tx, mut finished) = tokio::sync::mpsc::channel(1);
+    let mut srv = actix_test::start(move || {
+        let tx = tx.clone();
+        App::new().service(web::resource("{anything:.*}").to(
+            move |req: HttpRequest, stream: web::Payload| {
+                let tx: Sender<()> = tx.clone();
+                async move { ws::WsResponseBuilder::new(Ws { finished: tx }, &req, stream).start() }
+            },
+        ))
+    });
+
+    let mut framed = srv.ws().await.unwrap();
+
+    framed
+        .send(ws::Message::Text("I'll initiate close by server".into()))
+        .await
+        .unwrap();
+
+    let item = framed.next().await.unwrap().unwrap();
+    assert_eq!(item, ws::Frame::Close(Some(ws::CloseCode::Normal.into())));
+
+    framed
+        .send(ws::Message::Close(Some(ws::CloseCode::Normal.into())))
+        .await
+        .unwrap();
+
+    let nothing = actix_rt::time::timeout(std::time::Duration::from_secs(1), framed.next()).await;
+    assert_eq!(true, nothing.is_ok());
+    assert_eq!(true, nothing.unwrap().is_none());
+
+    let finished =
+        actix_rt::time::timeout(std::time::Duration::from_secs(1), finished.recv()).await;
+    assert_eq!(true, finished.is_ok());
+    assert_eq!(Some(()), finished.unwrap());
+}

actix-web-codegen/CHANGES.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Minimum supported Rust version (MSRV) is now 1.82.
+
 ## 4.3.0
 
 - Add `#[scope]` macro.

actix-web-codegen/tests/trybuild/route-custom-lowercase.stderr

@@ -13,14 +13,14 @@ error[E0277]: the trait bound `fn() -> impl std::future::Future<Output = String>
    |                                               required by a bound introduced by this call
    |
    = help: the following other types implement trait `HttpServiceFactory`:
-             Resource<T>
-             actix_web::Scope<T>
-             Vec<T>
-             Redirect
-             (A,)
              (A, B)
              (A, B, C)
              (A, B, C, D)
+             (A, B, C, D, E)
+             (A, B, C, D, E, F)
+             (A, B, C, D, E, F, G)
+             (A, B, C, D, E, F, G, H)
+             (A, B, C, D, E, F, G, H, I)
            and $N others
 note: required by a bound in `App::<T>::service`
   --> $WORKSPACE/actix-web/src/app.rs

actix-web-codegen/tests/trybuild/route-duplicate-method-fail.stderr

@@ -13,14 +13,14 @@ error[E0277]: the trait bound `fn() -> impl std::future::Future<Output = String>
    |                                               required by a bound introduced by this call
    |
    = help: the following other types implement trait `HttpServiceFactory`:
-             Resource<T>
-             actix_web::Scope<T>
-             Vec<T>
-             Redirect
-             (A,)
              (A, B)
              (A, B, C)
              (A, B, C, D)
+             (A, B, C, D, E)
+             (A, B, C, D, E, F)
+             (A, B, C, D, E, F, G)
+             (A, B, C, D, E, F, G, H)
+             (A, B, C, D, E, F, G, H, I)
            and $N others
 note: required by a bound in `App::<T>::service`
   --> $WORKSPACE/actix-web/src/app.rs

actix-web-codegen/tests/trybuild/route-missing-method-fail.stderr

@@ -15,14 +15,14 @@ error[E0277]: the trait bound `fn() -> impl std::future::Future<Output = String>
    |                                               required by a bound introduced by this call
    |
    = help: the following other types implement trait `HttpServiceFactory`:
-             Resource<T>
-             actix_web::Scope<T>
-             Vec<T>
-             Redirect
-             (A,)
              (A, B)
              (A, B, C)
              (A, B, C, D)
+             (A, B, C, D, E)
+             (A, B, C, D, E, F)
+             (A, B, C, D, E, F, G)
+             (A, B, C, D, E, F, G, H)
+             (A, B, C, D, E, F, G, H, I)
            and $N others
 note: required by a bound in `App::<T>::service`
   --> $WORKSPACE/actix-web/src/app.rs

actix-web-codegen/tests/trybuild/routes-missing-args-fail.stderr

@@ -29,14 +29,14 @@ error[E0277]: the trait bound `fn() -> impl std::future::Future<Output = String>
    |                                               required by a bound introduced by this call
    |
    = help: the following other types implement trait `HttpServiceFactory`:
-             Resource<T>
-             actix_web::Scope<T>
-             Vec<T>
-             Redirect
-             (A,)
              (A, B)
              (A, B, C)
              (A, B, C, D)
+             (A, B, C, D, E)
+             (A, B, C, D, E, F)
+             (A, B, C, D, E, F, G)
+             (A, B, C, D, E, F, G, H)
+             (A, B, C, D, E, F, G, H, I)
            and $N others
 note: required by a bound in `App::<T>::service`
   --> $WORKSPACE/actix-web/src/app.rs

actix-web-codegen/tests/trybuild/routes-missing-method-fail.stderr

@@ -15,14 +15,14 @@ error[E0277]: the trait bound `fn() -> impl std::future::Future<Output = String>
    |                                               required by a bound introduced by this call
    |
    = help: the following other types implement trait `HttpServiceFactory`:
-             Resource<T>
-             actix_web::Scope<T>
-             Vec<T>
-             Redirect
-             (A,)
              (A, B)
              (A, B, C)
              (A, B, C, D)
+             (A, B, C, D, E)
+             (A, B, C, D, E, F)
+             (A, B, C, D, E, F, G)
+             (A, B, C, D, E, F, G, H)
+             (A, B, C, D, E, F, G, H, I)
            and $N others
 note: required by a bound in `App::<T>::service`
   --> $WORKSPACE/actix-web/src/app.rs

actix-web/CHANGES.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+- Minimum supported Rust version (MSRV) is now 1.82.
+
+## 4.12.1
+
+- Correct `actix-http` dependency requirement.
+
 ## 4.12.0
 
 - `actix_web::response::builder::HttpResponseBuilder::streaming()` now sets `Content-Type` to `application/octet-stream` if `Content-Type` does not exist.

actix-web/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "4.12.0"
+version = "4.12.1"
 description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
 keywords = ["actix", "http", "web", "framework", "async"]
@@ -134,7 +134,7 @@ actix-service = "2"
 actix-tls = { version = "3.4", default-features = false, optional = true }
 actix-utils = "3"
 
-actix-http = "3.11"
+actix-http = "3.11.2"
 actix-router = { version = "0.5.3", default-features = false, features = ["http"] }
 actix-web-codegen = { version = "4.3", optional = true, default-features = false }
 
@@ -179,7 +179,7 @@ flate2 = "1.0.13"
 futures-util = { version = "0.3.17", default-features = false, features = ["std"] }
 rand = "0.9"
 rcgen = "0.13"
-rustls-pemfile = "2"
+rustls-pki-types = "1.13.1"
 serde = { version = "1", features = ["derive"] }
 static_assertions = "1"
 tls-openssl = { package = "openssl", version = "0.10.55" }

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.12.0)](https://docs.rs/actix-web/4.12.0)
+[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.12.1)](https://docs.rs/actix-web/4.12.1)
 ![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.12.0/status.svg)](https://deps.rs/crate/actix-web/4.12.0)
+[![Dependency Status](https://deps.rs/crate/actix-web/4.12.1/status.svg)](https://deps.rs/crate/actix-web/4.12.1)
 <br />
 [![CI](https://github.com/actix/actix-web/actions/workflows/ci.yml/badge.svg)](https://github.com/actix/actix-web/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/actix/actix-web/graph/badge.svg?token=dSwOnp9QCv)](https://codecov.io/gh/actix/actix-web)
@@ -78,23 +78,23 @@ async fn main() -> std::io::Result<()> {
 
 ### More Examples
 
-- [Hello World](https://github.com/actix/examples/tree/mainasics/hello-world)
-- [Basic Setup](https://github.com/actix/examples/tree/mainasics/basics)
-- [Application State](https://github.com/actix/examples/tree/mainasics/state)
-- [JSON Handling](https://github.com/actix/examples/tree/mainson/json)
-- [Multipart Streams](https://github.com/actix/examples/tree/mainorms/multipart)
-- [MongoDB Integration](https://github.com/actix/examples/tree/mainatabases/mongodb)
-- [Diesel Integration](https://github.com/actix/examples/tree/mainatabases/diesel)
-- [SQLite Integration](https://github.com/actix/examples/tree/mainatabases/sqlite)
-- [Postgres Integration](https://github.com/actix/examples/tree/mainatabases/postgres)
-- [Tera Templates](https://github.com/actix/examples/tree/mainemplating/tera)
-- [Askama Templates](https://github.com/actix/examples/tree/mainemplating/askama)
-- [HTTPS using Rustls](https://github.com/actix/examples/tree/mainttps-tls/rustls)
-- [HTTPS using OpenSSL](https://github.com/actix/examples/tree/mainttps-tls/openssl)
-- [Simple WebSocket](https://github.com/actix/examples/tree/mainebsockets)
-- [WebSocket Chat](https://github.com/actix/examples/tree/mainebsockets/chat)
+- [Hello World](https://github.com/actix/examples/tree/main/basics/hello-world)
+- [Basic Setup](https://github.com/actix/examples/tree/main/basics/basics)
+- [Application State](https://github.com/actix/examples/tree/main/basics/state)
+- [JSON Handling](https://github.com/actix/examples/tree/main/json/json)
+- [Multipart Streams](https://github.com/actix/examples/tree/main/forms/multipart)
+- [MongoDB Integration](https://github.com/actix/examples/tree/main/databases/mongodb)
+- [Diesel Integration](https://github.com/actix/examples/tree/main/databases/diesel)
+- [SQLite Integration](https://github.com/actix/examples/tree/main/databases/sqlite)
+- [Postgres Integration](https://github.com/actix/examples/tree/main/databases/postgres)
+- [Tera Templates](https://github.com/actix/examples/tree/main/templating/tera)
+- [Askama Templates](https://github.com/actix/examples/tree/main/templating/askama)
+- [HTTPS using Rustls](https://github.com/actix/examples/tree/main/https-tls/rustls)
+- [HTTPS using OpenSSL](https://github.com/actix/examples/tree/main/https-tls/openssl)
+- [Simple WebSocket](https://github.com/actix/examples/tree/main/websockets)
+- [WebSocket Chat](https://github.com/actix/examples/tree/main/websockets/chat)
 
-You may consider checking out [this directory](https://github.com/actix/examples/tree/mainfor more examples.
+You may consider checking out [this directory](https://github.com/actix/examples/tree/main) for more examples.
 
 ## Benchmarks
 

actix-web/tests/test_server.rs

@@ -688,30 +688,20 @@ async fn test_brotli_encoding_large_openssl() {
 
 #[cfg(feature = "rustls-0_23")]
 mod plus_rustls {
-    use std::io::BufReader;
-
     use rustls::{pki_types::PrivateKeyDer, ServerConfig as RustlsServerConfig};
-    use rustls_pemfile::{certs, pkcs8_private_keys};
+    use rustls_pki_types::PrivatePkcs8KeyDer;
 
     use super::*;
 
     fn tls_config() -> RustlsServerConfig {
         let rcgen::CertifiedKey { cert, key_pair } =
             rcgen::generate_simple_self_signed(["localhost".to_owned()]).unwrap();
-        let cert_file = cert.pem();
-        let key_file = key_pair.serialize_pem();
-
-        let cert_file = &mut BufReader::new(cert_file.as_bytes());
-        let key_file = &mut BufReader::new(key_file.as_bytes());
-
-        let cert_chain = certs(cert_file).collect::<Result<Vec<_>, _>>().unwrap();
-        let mut keys = pkcs8_private_keys(key_file)
-            .collect::<Result<Vec<_>, _>>()
-            .unwrap();
+        let cert_chain = vec![cert.der().clone()];
+        let key_der = PrivateKeyDer::Pkcs8(PrivatePkcs8KeyDer::from(key_pair.serialize_der()));
 
         RustlsServerConfig::builder()
             .with_no_client_auth()
-            .with_single_cert(cert_chain, PrivateKeyDer::Pkcs8(keys.remove(0)))
+            .with_single_cert(cert_chain, key_der)
             .unwrap()
     }
 

awc/CHANGES.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Minimum supported Rust version (MSRV) is now 1.82.
+
 ## 3.8.1
 
 - Fix a bug where `GO_AWAY` errors did not stop connections from returning to the pool.

awc/Cargo.toml

@@ -149,7 +149,7 @@ flate2 = "1.0.13"
 futures-util = { version = "0.3.17", default-features = false }
 static_assertions = "1.1"
 rcgen = "0.13"
-rustls-pemfile = "2"
+rustls-pki-types = "1.13.1"
 tokio = { version = "1.38.2", features = ["rt-multi-thread", "macros"] }
 zstd = "0.13"
 tls-rustls-0_23 = { package = "rustls", version = "0.23" } # add rustls 0.23 with default features to make aws_lc_rs work in tests

awc/src/request.rs

@@ -309,10 +309,7 @@ impl ClientRequest {
     /// Freeze request builder and construct `FrozenClientRequest`,
     /// which could be used for sending same request multiple times.
     pub fn freeze(self) -> Result<FrozenClientRequest, FreezeRequestError> {
-        let slf = match self.prep_for_sending() {
-            Ok(slf) => slf,
-            Err(err) => return Err(err.into()),
-        };
+        let slf = self.prep_for_sending()?;
 
         let request = FrozenClientRequest {
             head: Rc::new(slf.head),

awc/tests/test_rustls_client.rs

@@ -2,12 +2,9 @@
 
 extern crate tls_rustls_0_23 as rustls;
 
-use std::{
-    io::BufReader,
-    sync::{
-        atomic::{AtomicUsize, Ordering},
-        Arc,
-    },
+use std::sync::{
+    atomic::{AtomicUsize, Ordering},
+    Arc,
 };
 
 use actix_http::HttpService;
@@ -16,29 +13,18 @@ use actix_service::{fn_service, map_config, ServiceFactoryExt};
 use actix_tls::connect::rustls_0_23::webpki_roots_cert_store;
 use actix_utils::future::ok;
 use actix_web::{dev::AppConfig, http::Version, web, App, HttpResponse};
-use rustls::{
-    pki_types::{CertificateDer, PrivateKeyDer, ServerName},
-    ClientConfig, ServerConfig,
-};
-use rustls_pemfile::{certs, pkcs8_private_keys};
+use rustls::{pki_types::ServerName, ClientConfig, ServerConfig};
+use rustls_pki_types::{CertificateDer, PrivateKeyDer, PrivatePkcs8KeyDer};
 
 fn tls_config() -> ServerConfig {
     let rcgen::CertifiedKey { cert, key_pair } =
         rcgen::generate_simple_self_signed(["localhost".to_owned()]).unwrap();
-    let cert_file = cert.pem();
-    let key_file = key_pair.serialize_pem();
-
-    let cert_file = &mut BufReader::new(cert_file.as_bytes());
-    let key_file = &mut BufReader::new(key_file.as_bytes());
-
-    let cert_chain = certs(cert_file).collect::<Result<Vec<_>, _>>().unwrap();
-    let mut keys = pkcs8_private_keys(key_file)
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap();
+    let cert_chain = vec![cert.der().clone()];
+    let key_der = PrivateKeyDer::Pkcs8(PrivatePkcs8KeyDer::from(key_pair.serialize_der()));
 
     ServerConfig::builder()
         .with_no_client_auth()
-        .with_single_cert(cert_chain, PrivateKeyDer::Pkcs8(keys.remove(0)))
+        .with_single_cert(cert_chain, key_der)
         .unwrap()
 }
 

awc/tests/test_ws.rs

@@ -65,4 +65,8 @@ async fn test_simple() {
 
     let item = framed.next().await.unwrap().unwrap();
     assert_eq!(item, ws::Frame::Close(Some(ws::CloseCode::Normal.into())));
+
+    let nothing = actix_rt::time::timeout(std::time::Duration::from_secs(1), framed.next()).await;
+    assert_eq!(true, nothing.is_ok());
+    assert_eq!(true, nothing.unwrap().is_none());
 }

justfile

@@ -12,14 +12,7 @@ fmt:
 # Downgrade dependencies necessary to run MSRV checks/tests.
 [private]
 downgrade-for-msrv:
-    cargo {{ toolchain }} update -p=divan --precise=0.1.15 # next ver: 1.80.0
-    cargo {{ toolchain }} update -p=rayon --precise=1.10.0 # next ver: 1.80.0
-    cargo {{ toolchain }} update -p=rayon-core --precise=1.12.1 # next ver: 1.80.0
-    cargo {{ toolchain }} update -p=half --precise=2.4.1 # next ver: 1.81.0
-    cargo {{ toolchain }} update -p=idna_adapter --precise=1.2.0 # next ver: 1.82.0
-    cargo {{ toolchain }} update -p=litemap --precise=0.7.4 # next ver: 1.81.0
-    cargo {{ toolchain }} update -p=zerofrom --precise=0.1.5 # next ver: 1.81.0
-    cargo {{ toolchain }} update -p=time --precise=0.3.41 # next ver: 1.81.0
+    # no downgrades currently needed
 
 msrv := ```
     cargo metadata --format-version=1 \