Merge 296d546ca4 into e1da110e92

chore: Add public export for `EitherExtractError` (#3826 )
* chore: Export EitherExtractError for public use * refactor: export EitherExtractError
2025-11-13 19:59:42 +00:00 · 2025-11-11 15:28:40 +00:00 · 2025-11-10 01:54:15 +00:00 · 2025-11-10 01:53:48 +00:00
8 changed files with 11 additions and 9 deletions
--- a/.github/workflows/ci-post-merge.yml
+++ b/.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@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean

@ -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@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: just,cargo-hack

--- a/.github/workflows/ci.yml
+++ b/.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@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean

@ -117,7 +117,7 @@ jobs:
          toolchain: nightly

      - name: Install just
-        uses: taiki-e/install-action@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: just

--- a/.github/workflows/coverage.yml
+++ b/.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@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: just,cargo-llvm-cov,cargo-nextest

--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@ -77,7 +77,7 @@ jobs:
          toolchain: ${{ vars.RUST_VERSION_EXTERNAL_TYPES }}

      - name: Install just
-        uses: taiki-e/install-action@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: just

--- a/Cargo.lock
+++ b/Cargo.lock
@ -2377,9 +2377,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
 dependencies = [
 "proc-macro2",
 ]
--- a/actix-web/CHANGES.md
+++ b/actix-web/CHANGES.md
@ -5,6 +5,7 @@
 - `actix_web::response::builder::HttpResponseBuilder::streaming()` now sets `Content-Type` to `application/octet-stream` if `Content-Type` does not exist.
 - `actix_web::response::builder::HttpResponseBuilder::streaming()` now calls `actix_web::response::builder::HttpResponseBuilder::no_chunking()` if `Content-Length` is set by user.
 - Add `ws` crate feature (on-by-default) which forwards to `actix-http` and guards some of its `ResponseError` impls.
+- Add public export for `EitherExtractError` in `error` module.

 ## 4.11.0

--- a/actix-web/src/error/mod.rs
+++ b/actix-web/src/error/mod.rs
@ -21,6 +21,7 @@ mod response_error;

 pub(crate) use self::macros::{downcast_dyn, downcast_get_type_id};
 pub use self::{error::Error, internal::*, response_error::ResponseError};
+pub use crate::types::EitherExtractError;

 /// A convenience [`Result`](std::result::Result) for Actix Web operations.
 ///
--- a/actix-web/src/types/mod.rs
+++ b/actix-web/src/types/mod.rs
@ -11,7 +11,7 @@ mod query;
 mod readlines;

 pub use self::{
-    either::Either,
+    either::{Either, EitherExtractError},
    form::{Form, FormConfig, UrlEncoded},
    header::Header,
    html::Html,
Author	SHA1	Message	Date
ihc童鞋@提不起劲	f0e3a15f79	Merge `296d546ca4` into `e1da110e92`	2025-11-13 19:59:42 +00:00
Ruchir	e1da110e92	chore: Add public export for `EitherExtractError` (#3826 ) * chore: Export EitherExtractError for public use * refactor: export EitherExtractError	2025-11-11 15:28:40 +00:00
dependabot[bot]	219b988300	build(deps): bump taiki-e/install-action from 2.62.46 to 2.62.49 (#3823 ) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.62.46 to 2.62.49. - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](`f535147c22...44c6d64aa6`) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-version: 2.62.49 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>	2025-11-10 01:54:15 +00:00
dependabot[bot]	9cf3521390	build(deps): bump quote from 1.0.41 to 1.0.42 (#3825 ) Bumps [quote](https://github.com/dtolnay/quote) from 1.0.41 to 1.0.42. - [Release notes](https://github.com/dtolnay/quote/releases) - [Commits](https://github.com/dtolnay/quote/compare/1.0.41...1.0.42) --- updated-dependencies: - dependency-name: quote dependency-version: 1.0.42 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>	2025-11-10 01:53:48 +00:00