.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.48.1
+        uses: taiki-e/install-action@v2.47.18
         with:
           tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
 
@@ -83,7 +83,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
 
       - name: Install just, cargo-hack
-        uses: taiki-e/install-action@v2.48.1
+        uses: taiki-e/install-action@v2.47.18
         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.48.1
+        uses: taiki-e/install-action@v2.47.18
         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.48.1
+        uses: taiki-e/install-action@v2.47.18
         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.48.1
+        uses: taiki-e/install-action@v2.47.18
         with:
           tool: just,cargo-llvm-cov,cargo-nextest
 
@@ -32,7 +32,7 @@ jobs:
         run: just test-coverage-codecov
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.3.1
+        uses: codecov/codecov-action@v5.1.2
         with:
           files: codecov.json
           fail_ci_if_error: true

.github/workflows/lint.yml

@@ -77,12 +77,12 @@ jobs:
           toolchain: ${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
 
       - name: Install just
-        uses: taiki-e/install-action@v2.48.1
+        uses: taiki-e/install-action@v2.47.18
         with:
           tool: just
 
       - name: Install cargo-check-external-types
-        uses: taiki-e/cache-cargo-install-action@v2.1.0
+        uses: taiki-e/cache-cargo-install-action@v2.0.1
         with:
           tool: cargo-check-external-types
 

actix-http/CHANGES.md

@@ -5,7 +5,6 @@
 ### Added
 
 - Add `header::CLEAR_SITE_DATA` constant.
-- Add `Extensions::get_or_insert[_with]()` methods.
 
 ### Changed
 

actix-http/Cargo.toml

@@ -132,7 +132,7 @@ h2 = { version = "0.3.26", optional = true }
 # websockets
 local-channel = { version = "0.1", optional = true }
 base64 = { version = "0.22", optional = true }
-rand = { version = "0.9", optional = true }
+rand = { version = "0.8", optional = true }
 sha1 = { version = "0.10", optional = true }
 
 # openssl/rustls

actix-http/src/extensions.rs

@@ -104,35 +104,33 @@ impl Extensions {
             .and_then(|boxed| boxed.downcast_mut())
     }
 
-    /// Inserts the given `value` into the extensions if it is not present, then returns a reference
-    /// to the value in the extensions.
+    /// Get a mutable reference or insert an item of a given type.
     ///
     /// ```
-    /// # use actix_http::Extensions;
+    /// use actix_http::Extensions;
     /// let mut map = Extensions::new();
     /// assert_eq!(map.get::<Vec<u32>>(), None);
-    ///
     /// map.get_or_insert(Vec::<u32>::new()).push(1);
     /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1]));
-    ///
     /// map.get_or_insert(Vec::<u32>::new()).push(2);
     /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1,2]));
     /// ```
     pub fn get_or_insert<T: 'static>(&mut self, value: T) -> &mut T {
-        self.get_or_insert_with(|| value)
+        self.map
+            .entry(TypeId::of::<T>())
+            .or_insert(Box::new(value))
+            .downcast_mut()
+            .expect("extensions map to always contain value T")
     }
 
-    /// Inserts a value computed from `f` into the extensions if the given `value` is not present,
-    /// then returns a reference to the value in the extensions.
+    /// Get a mutable reference or insert an item of a given type calculated with the closure given.
     ///
     /// ```
-    /// # use actix_http::Extensions;
+    /// use actix_http::Extensions;
     /// let mut map = Extensions::new();
     /// assert_eq!(map.get::<Vec<u32>>(), None);
-    ///
     /// map.get_or_insert_with(Vec::<u32>::new).push(1);
     /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1]));
-    ///
     /// map.get_or_insert_with(Vec::<u32>::new).push(2);
     /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1,2]));
     /// ```
@@ -141,7 +139,7 @@ impl Extensions {
             .entry(TypeId::of::<T>())
             .or_insert_with(|| Box::new(default()))
             .downcast_mut()
-            .expect("extensions map should now contain a T value")
+            .expect("extensions map to always contain value T")
     }
 
     /// Remove an item from the map of a given type.

actix-http/tests/test_server.rs

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

actix-multipart/Cargo.toml

@@ -50,7 +50,7 @@ local-waker = "0.1"
 log = "0.4"
 memchr = "2.5"
 mime = "0.3"
-rand = "0.9"
+rand = "0.8"
 serde = "1"
 serde_json = "1"
 serde_plain = "1"

actix-multipart/src/test.rs

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

actix-router/src/quoter.rs

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

actix-router/src/resource.rs

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

actix-router/src/router.rs

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

actix-web/CHANGES.md

@@ -2,10 +2,10 @@
 
 ## Unreleased
 
-- Implement `Responder` for `Result<(), E: Into<Error>>`. Returning `Ok(())` responds with HTTP 204 No Content.
 - On Windows, an error is now returned from `HttpServer::bind()` (or TLS variants) when binding to a socket that's already in use.
 - Update `brotli` dependency to `7`.
 - Minimum supported Rust version (MSRV) is now 1.75.
+- Added `Extensions::get_or_insert` and `Extensions::get_or_insert_with`
 
 ## 4.9.0
 

actix-web/Cargo.toml

@@ -180,7 +180,7 @@ criterion = { version = "0.5", features = ["html_reports"] }
 env_logger = "0.11"
 flate2 = "1.0.13"
 futures-util = { version = "0.3.17", default-features = false, features = ["std"] }
-rand = "0.9"
+rand = "0.8"
 rcgen = "0.13"
 rustls-pemfile = "2"
 serde = { version = "1", features = ["derive"] }

actix-web/src/response/responder.rs

@@ -131,23 +131,6 @@ where
     }
 }
 
-// Note: see https://github.com/actix/actix-web/issues/1108 for reasoning why Responder is not
-// implemented for `()`, and https://github.com/actix/actix-web/pull/3560 for discussion about this
-// impl and the decision not to include a similar one for `Option<()>`.
-impl<E> Responder for Result<(), E>
-where
-    E: Into<Error>,
-{
-    type Body = BoxBody;
-
-    fn respond_to(self, _req: &HttpRequest) -> HttpResponse {
-        match self {
-            Ok(()) => HttpResponse::new(StatusCode::NO_CONTENT),
-            Err(err) => HttpResponse::from_error(err.into()),
-        }
-    }
-}
-
 impl<R: Responder> Responder for (R, StatusCode) {
     type Body = R::Body;
 

actix-web/tests/test_server.rs

@@ -25,7 +25,7 @@ use openssl::{
     ssl::{SslAcceptor, SslMethod},
     x509::X509,
 };
-use rand::distr::{Alphanumeric, SampleString as _};
+use rand::{distributions::Alphanumeric, Rng as _};
 
 mod utils;
 
@@ -188,7 +188,11 @@ async fn body_gzip_large() {
 
 #[actix_rt::test]
 async fn test_body_gzip_large_random() {
-    let data = Alphanumeric.sample_string(&mut rand::rng(), 70_000);
+    let data = rand::thread_rng()
+        .sample_iter(&Alphanumeric)
+        .take(70_000)
+        .map(char::from)
+        .collect::<String>();
     let srv_data = data.clone();
 
     let srv = actix_test::start_with(actix_test::config().h1(), move || {
@@ -428,7 +432,11 @@ async fn test_zstd_encoding() {
 
 #[actix_rt::test]
 async fn test_zstd_encoding_large() {
-    let data = Alphanumeric.sample_string(&mut rand::rng(), 320_000);
+    let data = rand::thread_rng()
+        .sample_iter(&Alphanumeric)
+        .take(320_000)
+        .map(char::from)
+        .collect::<String>();
 
     let srv = actix_test::start_with(actix_test::config().h1(), || {
         App::new().service(
@@ -521,7 +529,11 @@ async fn test_gzip_encoding_large() {
 
 #[actix_rt::test]
 async fn test_reading_gzip_encoding_large_random() {
-    let data = Alphanumeric.sample_string(&mut rand::rng(), 60_000);
+    let data = rand::thread_rng()
+        .sample_iter(&Alphanumeric)
+        .take(60_000)
+        .map(char::from)
+        .collect::<String>();
 
     let srv = actix_test::start_with(actix_test::config().h1(), || {
         App::new().service(web::resource("/").route(web::to(move |body: Bytes| async {
@@ -587,7 +599,11 @@ async fn test_reading_deflate_encoding_large() {
 
 #[actix_rt::test]
 async fn test_reading_deflate_encoding_large_random() {
-    let data = Alphanumeric.sample_string(&mut rand::rng(), 160_000);
+    let data = rand::thread_rng()
+        .sample_iter(&Alphanumeric)
+        .take(160_000)
+        .map(char::from)
+        .collect::<String>();
 
     let srv = actix_test::start_with(actix_test::config().h1(), || {
         App::new().service(web::resource("/").route(web::to(move |body: Bytes| async {
@@ -632,7 +648,11 @@ async fn test_brotli_encoding() {
 
 #[actix_rt::test]
 async fn test_brotli_encoding_large() {
-    let data = Alphanumeric.sample_string(&mut rand::rng(), 320_000);
+    let data = rand::thread_rng()
+        .sample_iter(&Alphanumeric)
+        .take(320_000)
+        .map(char::from)
+        .collect::<String>();
 
     let srv = actix_test::start_with(actix_test::config().h1(), || {
         App::new().service(
@@ -717,7 +737,11 @@ mod plus_rustls {
 
     #[actix_rt::test]
     async fn test_reading_deflate_encoding_large_random_rustls() {
-        let data = Alphanumeric.sample_string(&mut rand::rng(), 160_000);
+        let data = rand::thread_rng()
+            .sample_iter(&Alphanumeric)
+            .take(160_000)
+            .map(char::from)
+            .collect::<String>();
 
         let srv = actix_test::start_with(actix_test::config().rustls_0_23(tls_config()), || {
             App::new().service(web::resource("/").route(web::to(|bytes: Bytes| async {

awc/Cargo.toml

@@ -116,7 +116,7 @@ log =" 0.4"
 mime = "0.3"
 percent-encoding = "2.1"
 pin-project-lite = "0.2"
-rand = "0.9"
+rand = "0.8"
 serde = "1.0"
 serde_json = "1.0"
 serde_urlencoded = "0.7"

awc/src/ws.rs

@@ -326,7 +326,7 @@ impl WebsocketsRequest {
 
         // Generate a random key for the `Sec-WebSocket-Key` header which is a base64-encoded
         // (see RFC 4648 §4) value that, when decoded, is 16 bytes in length (RFC 6455 §1.3).
-        let sec_key = rand::random::<[u8; 16]>();
+        let sec_key: [u8; 16] = rand::random();
         let key = BASE64_STANDARD.encode(sec_key);
 
         self.head.headers.insert(

awc/tests/test_client.rs

@@ -20,7 +20,7 @@ use base64::prelude::*;
 use bytes::Bytes;
 use cookie::Cookie;
 use futures_util::stream;
-use rand::distr::{Alphanumeric, SampleString as _};
+use rand::Rng;
 
 mod utils;
 
@@ -516,7 +516,11 @@ async fn client_gzip_encoding_large() {
 #[cfg(feature = "compress-gzip")]
 #[actix_rt::test]
 async fn client_gzip_encoding_large_random() {
-    let data = Alphanumeric.sample_string(&mut rand::rng(), 100_000);
+    let data = rand::thread_rng()
+        .sample_iter(&rand::distributions::Alphanumeric)
+        .take(100_000)
+        .map(char::from)
+        .collect::<String>();
 
     let srv = actix_test::start(|| {
         App::new().service(web::resource("/").route(web::to(|data: Bytes| async {
@@ -558,7 +562,11 @@ async fn client_brotli_encoding() {
 #[cfg(feature = "compress-brotli")]
 #[actix_rt::test]
 async fn client_brotli_encoding_large_random() {
-    let data = Alphanumeric.sample_string(&mut rand::rng(), 70_000);
+    let data = rand::thread_rng()
+        .sample_iter(&rand::distributions::Alphanumeric)
+        .take(70_000)
+        .map(char::from)
+        .collect::<String>();
 
     let srv = actix_test::start(|| {
         App::new().service(web::resource("/").route(web::to(|data: Bytes| async {
@@ -599,7 +607,11 @@ async fn client_deflate_encoding() {
 
 #[actix_rt::test]
 async fn client_deflate_encoding_large_random() {
-    let data = Alphanumeric.sample_string(&mut rand::rng(), 70_000);
+    let data = rand::thread_rng()
+        .sample_iter(rand::distributions::Alphanumeric)
+        .map(char::from)
+        .take(70_000)
+        .collect::<String>();
 
     let srv = actix_test::start(|| {
         App::new().default_service(web::to(|body: Bytes| async {