Merge branch 'master' into scope_work

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

@@ -45,7 +45,7 @@ jobs:
           toolchain: ${{ matrix.version.version }}
 
       - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.33.16
+        uses: taiki-e/install-action@v2.33.22
         with:
           tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
 
@@ -76,7 +76,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
 
       - name: Install cargo-hack
-        uses: taiki-e/install-action@v2.33.16
+        uses: taiki-e/install-action@v2.33.22
         with:
           tool: cargo-hack
 

.github/workflows/ci.yml

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

.github/workflows/coverage.yml

@@ -23,7 +23,7 @@ jobs:
           components: llvm-tools-preview
 
       - name: Install cargo-llvm-cov
-        uses: taiki-e/install-action@v2.33.16
+        uses: taiki-e/install-action@v2.33.22
         with:
           tool: cargo-llvm-cov
 

.github/workflows/lint.yml

@@ -82,7 +82,7 @@ jobs:
           toolchain: nightly-2024-04-26
 
       - name: Install cargo-public-api
-        uses: taiki-e/install-action@v2.33.16
+        uses: taiki-e/install-action@v2.33.22
         with:
           tool: cargo-public-api
 

actix-web/CHANGES.md

@@ -9,6 +9,7 @@
 ### Changed
 
 - Minimum supported Rust version (MSRV) is now 1.72.
+- Avoid type confusion in rare circumstances
 
 ## 4.5.1
 

actix-web/src/app_service.rs

@@ -263,8 +263,9 @@ impl ServiceFactory<ServiceRequest> for AppRoutingFactory {
             let guards = guards.borrow_mut().take().unwrap_or_default();
             let factory_fut = factory.new_service(());
             async move {
-                let service = factory_fut.await?;
-                Ok((path, guards, service))
+                factory_fut
+                    .await
+                    .map(move |service| (path, guards, service))
             }
         }));
 

actix-web/src/scope.rs

@@ -470,8 +470,9 @@ impl ServiceFactory<ServiceRequest> for ScopeFactory {
             let guards = guards.borrow_mut().take().unwrap_or_default();
             let factory_fut = factory.new_service(());
             async move {
-                let service = factory_fut.await?;
-                Ok((path, guards, service))
+                factory_fut
+                    .await
+                    .map(move |service| (path, guards, service))
             }
         }));