From aaedb9c62542204732ac14a7f339b74ff8337e6c Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 16 Sep 2023 00:30:38 +0100 Subject: [PATCH 01/35] MSRV 1.68 (#328) --- .github/ISSUE_TEMPLATE/config.yml | 5 -- .github/dependabot.yml | 10 +++ .github/workflows/ci-post-merge.yml | 39 +++++------ .github/workflows/ci.yml | 70 ++++++++++--------- .github/workflows/coverage.yml | 11 +-- .github/workflows/lint.yml | 19 ++--- .github/workflows/upload-doc.yml | 2 +- Cargo.toml | 8 +-- actix-cors/CHANGES.md | 52 +++++++------- actix-cors/Cargo.toml | 6 +- actix-identity/CHANGES.md | 38 +++++----- actix-identity/Cargo.toml | 6 +- actix-limitation/CHANGES.md | 10 +-- actix-limitation/Cargo.toml | 6 +- actix-protobuf/CHANGES.md | 24 +++---- actix-protobuf/Cargo.toml | 6 +- actix-redis/CHANGES.md | 34 ++++----- actix-redis/Cargo.toml | 6 +- actix-session/CHANGES.md | 40 +++++------ actix-session/Cargo.toml | 6 +- actix-session/src/session.rs | 11 ++- actix-session/src/storage/redis_rs.rs | 1 + actix-session/tests/opaque_errors.rs | 9 ++- actix-settings/CHANGES.md | 8 +-- actix-settings/Cargo.toml | 6 +- actix-web-httpauth/CHANGES.md | 36 +++++----- actix-web-httpauth/Cargo.toml | 6 +- actix-web-httpauth/src/extractors/bearer.rs | 2 +- .../src/headers/authorization/scheme/basic.rs | 2 +- .../headers/authorization/scheme/bearer.rs | 2 +- clippy.toml | 1 - 31 files changed, 246 insertions(+), 236 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/config.yml create mode 100644 .github/dependabot.yml delete mode 100644 clippy.toml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 2aa3282aa4..0000000000 --- a/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,5 +0,0 @@ -blank_issues_enabled: true -contact_links: - - name: Gitter channel (actix) - url: https://gitter.im/actix/actix - about: Please ask and answer questions about the actix project here. diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000..23f6c3ea82 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: cargo + directory: / + schedule: + interval: weekly + - package-ecosystem: github-actions + directory: / + schedule: + interval: daily diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index e979739765..fee08077d3 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -16,10 +16,8 @@ jobs: matrix: target: - { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu } - version: - - nightly - name: ${{ matrix.target.name }} / ${{ matrix.version }} + name: ${{ matrix.target.name }} / nightly runs-on: ${{ matrix.target.os }} services: @@ -32,13 +30,14 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install Rust (${{ matrix.version }}) - uses: actions-rust-lang/setup-rust-toolchain@v1 + - name: Install Rust (nightly) + uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 with: - toolchain: ${{ matrix.version }} + toolchain: nightly - - uses: taiki-e/cache-cargo-install-action@v1 - with: { tool: cargo-hack } + - uses: taiki-e/install-action@v2.18.9 + with: + tool: cargo-hack - name: check minimal run: cargo ci-min @@ -61,30 +60,26 @@ jobs: build_and_test_other_nightly: strategy: fail-fast: false + # prettier-ignore matrix: target: - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin } - - { - name: Windows, - os: windows-latest, - triple: x86_64-pc-windows-msvc, - } - version: - - nightly - - name: ${{ matrix.target.name }} / ${{ matrix.version }} + - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc } + + name: ${{ matrix.target.name }} / nightly runs-on: ${{ matrix.target.os }} steps: - uses: actions/checkout@v3 - - name: Install Rust (${{ matrix.version }}) - uses: actions-rust-lang/setup-rust-toolchain@v1 + - name: Install Rust (nightly) + uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 with: - toolchain: ${{ matrix.version }} + toolchain: nightly - - uses: taiki-e/cache-cargo-install-action@v1 - with: { tool: cargo-hack } + - uses: taiki-e/install-action@v2.18.9 + with: + tool: cargo-hack - name: check minimal run: cargo ci-min diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84e502340c..e46663cf06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,8 +1,12 @@ name: CI on: - pull_request: {} - push: { branches: [master] } + pull_request: + types: [opened, synchronize, reopened] + merge_group: + types: [checks_requested] + push: + branches: [master] permissions: { contents: read } @@ -18,10 +22,10 @@ jobs: target: - { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu } version: - - '1.60' # MSRV - - stable + - { name: msrv, version: 1.68.0 } + - { name: stable, version: stable } - name: ${{ matrix.target.name }} / ${{ matrix.version }} + name: ${{ matrix.target.name }} / ${{ matrix.version.name }} runs-on: ${{ matrix.target.os }} services: @@ -39,19 +43,20 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install Rust (${{ matrix.version }}) - uses: actions-rust-lang/setup-rust-toolchain@v1 + - name: Install Rust (${{ matrix.version.name }}) + uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 with: - toolchain: ${{ matrix.version }} + toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/cache-cargo-install-action@v1 - with: { tool: cargo-hack } + uses: taiki-e/install-action@v2.18.9 + with: + tool: cargo-hack - - name: workaround MSRV issues - if: matrix.version != 'stable' - run: | - cargo update -p=time:0.3.20 --precise=0.3.16 + # - name: workaround MSRV issues + # if: matrix.version.name == 'msrv' + # run: | + # cargo update -p=time:0.3.20 --precise=0.3.16 - name: check minimal run: cargo ci-min @@ -75,36 +80,34 @@ jobs: strategy: fail-fast: false matrix: + # prettier-ignore target: - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin } - - { - name: Windows, - os: windows-latest, - triple: x86_64-pc-windows-msvc, - } + - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc } version: - - '1.60' # MSRV - - stable + - { name: msrv, version: 1.68.0 } + - { name: stable, version: stable } - name: ${{ matrix.target.name }} / ${{ matrix.version }} + name: ${{ matrix.target.name }} / ${{ matrix.version.name }} runs-on: ${{ matrix.target.os }} steps: - uses: actions/checkout@v3 - - name: Install Rust (${{ matrix.version }}) - uses: actions-rust-lang/setup-rust-toolchain@v1 + - name: Install Rust (${{ matrix.version.name }}) + uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 with: - toolchain: ${{ matrix.version }} + toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/cache-cargo-install-action@v1 - with: { tool: cargo-hack } + uses: taiki-e/install-action@v2.18.9 + with: + tool: cargo-hack - - name: workaround MSRV issues - if: matrix.version != 'stable' - run: | - cargo update -p=time:0.3.20 --precise=0.3.16 + # - name: workaround MSRV issues + # if: matrix.version.name == 'msrv' + # run: | + # cargo update -p=time:0.3.20 --precise=0.3.16 - name: check minimal run: cargo ci-min @@ -131,8 +134,9 @@ jobs: - uses: actions/checkout@v3 - name: Install Rust (nightly) - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: { toolchain: nightly } + uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 + with: + toolchain: nightly - name: doc tests timeout-minutes: 40 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 0001494363..d0fc4916f9 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -1,7 +1,8 @@ name: Coverage on: - push: { branches: [master] } + push: + branches: [master] permissions: { contents: read } @@ -24,8 +25,9 @@ jobs: - uses: actions/checkout@v3 - name: Install Rust (nightly) - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: { toolchain: nightly } + uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 + with: + toolchain: nightly - name: Generate coverage file run: | @@ -34,4 +36,5 @@ jobs: - name: Upload to Codecov uses: codecov/codecov-action@v3 - with: { file: cobertura.xml } + with: + file: cobertura.xml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 97ad9cec4f..976406e51f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - name: Install Rust (nightly) - uses: actions-rust-lang/setup-rust-toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 with: toolchain: nightly components: rustfmt @@ -29,11 +29,12 @@ jobs: - uses: actions/checkout@v3 - name: Install Rust - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: { components: clippy } + uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 + with: + components: clippy - name: Check with Clippy - run: cargo clippy --workspace --tests --all-features + run: cargo clippy --workspace --tests --all-features -- -A unknown_lints public-api-diff: runs-on: ubuntu-latest @@ -47,12 +48,14 @@ jobs: uses: actions/checkout@v3 - name: Install Rust (nightly) - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: { toolchain: nightly } + uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 + with: + toolchain: nightly - name: Install cargo-public-api - uses: taiki-e/cache-cargo-install-action@v1 - with: { tool: cargo-public-api } + uses: taiki-e/cache-cargo-install-action@v1.2.1 + with: + tool: cargo-public-api - name: generate API diff run: | diff --git a/.github/workflows/upload-doc.yml b/.github/workflows/upload-doc.yml index a59f7f22fa..20ec782c54 100644 --- a/.github/workflows/upload-doc.yml +++ b/.github/workflows/upload-doc.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - name: Install Rust (nightly) - uses: actions-rust-lang/setup-rust-toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 with: { toolchain: nightly } - name: Build Docs diff --git a/Cargo.toml b/Cargo.toml index a1993e2441..645d4f39dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,10 +11,10 @@ members = [ "actix-web-httpauth", ] -# TODO(MSRV 1.64) -# [workspace.package] -# edition = "2018" -# rust-version = "1.60" +[workspace.package] +license = "MIT OR Apache-2.0" +edition = "2021" +rust-version = "1.68" [patch.crates-io] actix-cors = { path = "./actix-cors" } diff --git a/actix-cors/CHANGES.md b/actix-cors/CHANGES.md index 31a23cb71c..9b315db1f5 100644 --- a/actix-cors/CHANGES.md +++ b/actix-cors/CHANGES.md @@ -1,79 +1,79 @@ # Changes -## Unreleased - 2022-xx-xx +## Unreleased -- Minimum supported Rust version (MSRV) is now 1.60. +- Minimum supported Rust version (MSRV) is now 1.68. -## 0.6.4 - 2022-10-28 +## 0.6.4 - Add `Cors::allow_private_network_access()` behind an unstable flag (`draft-private-network-access`). [#297] [#297]: https://github.com/actix/actix-extras/pull/297 -## 0.6.3 - 2022-09-21 +## 0.6.3 - Add `Cors::block_on_origin_mismatch()` option for controlling if requests are pre-emptively rejected. [#287] - Minimum supported Rust version (MSRV) is now 1.59 due to transitive `time` dependency. [#287]: https://github.com/actix/actix-extras/pull/287 -## 0.6.2 - 2022-08-07 +## 0.6.2 - Fix `expose_any_header` to return list of response headers. [#273] - Minimum supported Rust version (MSRV) is now 1.57 due to transitive `time` dependency. [#273]: https://github.com/actix/actix-extras/pull/273 -## 0.6.1 - 2022-03-07 +## 0.6.1 - Do not consider requests without a `Access-Control-Request-Method` as preflight. [#226] [#226]: https://github.com/actix/actix-extras/pull/226 -## 0.6.0 - 2022-02-25 +## 0.6.0 - Update `actix-web` dependency to 4.0. -## 0.6.0-beta.10 - 2022-02-07 +## 0.6.0-beta.10 - Ensure that preflight responses contain a `Vary` header. [#224] [#224]: https://github.com/actix/actix-extras/pull/224 -## 0.6.0-beta.9 - 2022-02-07 +## 0.6.0-beta.9 - Relax body type bounds on middleware impl. [#223] - Update `actix-web` dependency to `4.0.0-rc.1`. [#223]: https://github.com/actix/actix-extras/pull/223 -## 0.6.0-beta.8 - 2021-12-29 +## 0.6.0-beta.8 - Minimum supported Rust version (MSRV) is now 1.54. -## 0.6.0-beta.7 - 2021-12-18 +## 0.6.0-beta.7 - Update `actix-web` dependency to `4.0.0-beta.15`. [#216] [#216]: https://github.com/actix/actix-extras/pull/216 -## 0.6.0-beta.6 - 2021-12-13 +## 0.6.0-beta.6 - Fix panic when wrapping routes with dynamic segments in their paths. [#213] [#213]: https://github.com/actix/actix-extras/pull/213 -## 0.6.0-beta.5 - 2021-12-12 _(YANKED)_ +## 0.6.0-beta.5 _(YANKED)_ - Update `actix-web` dependency to `4.0.0.beta-14`. [#209] [#209]: https://github.com/actix/actix-extras/pull/209 -## 0.6.0-beta.4 - 2021-11-22 +## 0.6.0-beta.4 - No significant changes since `0.6.0-beta.3`. -## 0.6.0-beta.3 - 2021-10-21 +## 0.6.0-beta.3 - Make `Cors` middleware generic over body type [#195] - Fix `expose_any_header` behavior. [#204] @@ -84,37 +84,37 @@ [#203]: https://github.com/actix/actix-extras/pull/203 [#204]: https://github.com/actix/actix-extras/pull/204 -## 0.6.0-beta.2 - 2021-06-27 +## 0.6.0-beta.2 - No notable changes. -## 0.6.0-beta.1 - 2021-04-02 +## 0.6.0-beta.1 - Update `actix-web` dependency to 4.0.0 beta. - Minimum supported Rust version (MSRV) is now 1.46.0. -## 0.5.4 - 2020-12-31 +## 0.5.4 - Fix `expose_any_header` method, now set the correct field. [#143] [#143]: https://github.com/actix/actix-extras/pull/143 -## 0.5.3 - 2020-11-19 +## 0.5.3 - Fix version spec for `derive_more` dependency. -## 0.5.2 - 2020-11-15 +## 0.5.2 - Ensure `tinyvec` is using the correct features. - Bump `futures-util` minimum version to `0.3.7` to avoid `RUSTSEC-2020-0059`. -## 0.5.1 - 2020-11-05 +## 0.5.1 - Fix `allow_any_header` method, now set the correct field. [#121] [#121]: https://github.com/actix/actix-extras/pull/121 -## 0.5.0 - 2020-10-19 +## 0.5.0 - Disallow `*` in `Cors::allowed_origin`. [#114]. - Hide `CorsMiddleware` from docs. [#118]. @@ -134,13 +134,13 @@ [#119]: https://github.com/actix/actix-extras/pull/119 [#120]: https://github.com/actix/actix-extras/pull/120 -## 0.4.1 - 2020-10-07 +## 0.4.1 - Allow closures to be used with `allowed_origin_fn`. [#110] [#110]: https://github.com/actix/actix-extras/pull/110 -## 0.4.0 - 2020-09-27 +## 0.4.0 - Implement `allowed_origin_fn` builder method. [#93] - Use `TryInto` instead of `TryFrom` where applicable. [#106] @@ -148,13 +148,13 @@ [#93]: https://github.com/actix/actix-extras/pull/93 [#106]: https://github.com/actix/actix-extras/pull/106 -## 0.3.0 - 2020-09-11 +## 0.3.0 - Update `actix-web` dependency to 3.0.0. - Minimum supported Rust version (MSRV) is now 1.42.0. - Implement the Debug trait on all public types. -## 0.3.0-alpha.1 - 2020-03-11 +## 0.3.0-alpha.1 - Minimize `futures-*` dependencies - Update `actix-web` dependency to 3.0.0-alpha.1 diff --git a/actix-cors/Cargo.toml b/actix-cors/Cargo.toml index a347f97875..e446c377ad 100644 --- a/actix-cors/Cargo.toml +++ b/actix-cors/Cargo.toml @@ -9,9 +9,9 @@ description = "Cross-Origin Resource Sharing (CORS) controls for Actix Web" keywords = ["actix", "cors", "web", "security", "crossorigin"] homepage = "https://actix.rs" repository = "https://github.com/actix/actix-extras.git" -license = "MIT OR Apache-2.0" -edition = "2018" -rust-version = "1.60" +license.workspace = true +edition.workspace = true +rust-version.workspace = true [package.metadata.docs.rs] rustdoc-args = ["--cfg", "docsrs"] diff --git a/actix-identity/CHANGES.md b/actix-identity/CHANGES.md index de5f2d15f8..655f2e1b18 100644 --- a/actix-identity/CHANGES.md +++ b/actix-identity/CHANGES.md @@ -1,25 +1,25 @@ # Changes -## Unreleased - 2022-xx-xx +## Unreleased - Replace use of `anyhow::Error` with specific error types. [#296] -- Minimum supported Rust version (MSRV) is now 1.60. +- Minimum supported Rust version (MSRV) is now 1.68. [#296]: https://github.com/actix/actix-extras/pull/296 -## 0.5.2 - 2022-07-19 +## 0.5.2 - Fix visit deadline. [#263] [#263]: https://github.com/actix/actix-extras/pull/263 -## 0.5.1 - 2022-07-11 +## 0.5.1 - Remove unnecessary dependencies. [#259] [#259]: https://github.com/actix/actix-extras/pull/259 -## 0.5.0 - 2022-07-11 +## 0.5.0 `actix-identity` v0.5 is a complete rewrite. The goal is to streamline user experience and reduce maintenance overhead. @@ -55,56 +55,56 @@ Changes: [#246]: https://github.com/actix/actix-extras/pull/246 -## 0.4.0 - 2022-03-01 +## 0.4.0 - Update `actix-web` dependency to `4`. -## 0.4.0-beta.9 - 2022-02-07 +## 0.4.0-beta.9 - Relax body type bounds on middleware impl. [#223] - Update `actix-web` dependency to `4.0.0-rc.1`. [#223]: https://github.com/actix/actix-extras/pull/223 -## 0.4.0-beta.8 - 2022-01-21 +## 0.4.0-beta.8 - No significant changes since `0.4.0-beta.7`. -## 0.4.0-beta.7 - 2021-12-29 +## 0.4.0-beta.7 - Update `actix-web` dependency to `4.0.0.beta-18`. [#218] - Minimum supported Rust version (MSRV) is now 1.54. [#218]: https://github.com/actix/actix-extras/pull/218 -## 0.4.0-beta.6 - 2021-12-18 +## 0.4.0-beta.6 - Update `actix-web` dependency to `4.0.0.beta-15`. [#216] [#216]: https://github.com/actix/actix-extras/pull/216 -## 0.4.0-beta.5 - 2021-12-12 +## 0.4.0-beta.5 - Update `actix-web` dependency to `4.0.0.beta-14`. [#209] [#209]: https://github.com/actix/actix-extras/pull/209 -## 0.4.0-beta.4 - 2021-11-22 +## 0.4.0-beta.4 - No significant changes since `0.4.0-beta.3`. -## 0.4.0-beta.3 - 2021-10-21 +## 0.4.0-beta.3 - Update `actix-web` dependency to v4.0.0-beta.10. [#203] - Minimum supported Rust version (MSRV) is now 1.52. [#203]: https://github.com/actix/actix-extras/pull/203 -## 0.4.0-beta.2 - 2021-06-27 +## 0.4.0-beta.2 - No notable changes. -## 0.4.0-beta.1 - 2021-04-02 +## 0.4.0-beta.1 - Rename `CookieIdentityPolicy::{max_age => max_age_secs}`. [#168] - Rename `CookieIdentityPolicy::{max_age_time => max_age}`. [#168] @@ -113,24 +113,24 @@ Changes: [#168]: https://github.com/actix/actix-extras/pull/168 -## 0.3.1 - 2020-09-20 +## 0.3.1 - Add method to set `HttpOnly` flag on cookie identity. [#102] [#102]: https://github.com/actix/actix-extras/pull/102 -## 0.3.0 - 2020-09-11 +## 0.3.0 - Update `actix-web` dependency to 3.0.0. - Minimum supported Rust version (MSRV) is now 1.42.0. -## 0.3.0-alpha.1 - 2020-03-14 +## 0.3.0-alpha.1 - Update the `time` dependency to 0.2.7 - Update the `actix-web` dependency to 3.0.0-alpha.1 - Minimize `futures` dependency -## 0.2.1 - 2020-01-10 +## 0.2.1 - Fix panic with already borrowed: BorrowMutError #1263 diff --git a/actix-identity/Cargo.toml b/actix-identity/Cargo.toml index 3733951914..3adfbdd0fe 100644 --- a/actix-identity/Cargo.toml +++ b/actix-identity/Cargo.toml @@ -9,9 +9,9 @@ description = "Identity management for Actix Web" keywords = ["actix", "auth", "identity", "web", "security"] homepage = "https://actix.rs" repository = "https://github.com/actix/actix-extras.git" -license = "MIT OR Apache-2.0" -edition = "2018" -rust-version = "1.60" +license.workspace = true +edition.workspace = true +rust-version.workspace = true [package.metadata.docs.rs] rustdoc-args = ["--cfg", "docsrs"] diff --git a/actix-limitation/CHANGES.md b/actix-limitation/CHANGES.md index 2a88897444..db60aea41e 100644 --- a/actix-limitation/CHANGES.md +++ b/actix-limitation/CHANGES.md @@ -1,10 +1,10 @@ # Changes -## Unreleased - 2022-xx-xx +## Unreleased - Update `redis` dependency to `0.22`. -## 0.4.0 - 2022-09-10 +## 0.4.0 - Add `Builder::key_by` for setting a custom rate limit key function. - Implement `Default` for `RateLimiter`. @@ -12,13 +12,13 @@ - In the middleware errors from the count function are matched and respond with `INTERNAL_SERVER_ERROR` if it's an unexpected error, instead of the default `TOO_MANY_REQUESTS`. - Minimum supported Rust version (MSRV) is now 1.59 due to transitive `time` dependency. -## 0.3.0 - 2022-07-11 +## 0.3.0 - `Limiter::builder` now takes an `impl Into`. - Removed lifetime from `Builder`. - Updated `actix-session` dependency to `0.7`. -## 0.2.0 - 2022-03-22 +## 0.2.0 - Update Actix Web dependency to v4 ecosystem. - Update Tokio dependencies to v1 ecosystem. @@ -26,6 +26,6 @@ - Rename `Builder::{finish => build}()`. - Exceeding the rate limit now returns a 429 Too Many Requests response. -## 0.1.4 - 2022-03-18 +## 0.1.4 - Adopted into @actix org from . diff --git a/actix-limitation/Cargo.toml b/actix-limitation/Cargo.toml index 8287c5e25e..0b0cf3d7d8 100644 --- a/actix-limitation/Cargo.toml +++ b/actix-limitation/Cargo.toml @@ -9,9 +9,9 @@ description = "Rate limiter using a fixed window counter for arbitrary keys, bac keywords = ["actix-web", "rate-api", "rate-limit", "limitation"] categories = ["asynchronous", "web-programming"] repository = "https://github.com/actix/actix-extras.git" -license = "MIT OR Apache-2.0" -edition = "2018" -rust-version = "1.60" +license.workspace = true +edition.workspace = true +rust-version.workspace = true [package.metadata.docs.rs] rustdoc-args = ["--cfg", "docsrs"] diff --git a/actix-protobuf/CHANGES.md b/actix-protobuf/CHANGES.md index 66b7326fae..bab17de3db 100644 --- a/actix-protobuf/CHANGES.md +++ b/actix-protobuf/CHANGES.md @@ -1,39 +1,39 @@ # Changes -## Unreleased - 2022-xx-xx +## Unreleased -- Minimum supported Rust version (MSRV) is now 1.60. +- Minimum supported Rust version (MSRV) is now 1.68. -## 0.9.0 - 2022-08-24 +## 0.9.0 - Added `application/x-protobuf` as an acceptable header. - Updated `prost` dependency to `0.11`. -## 0.8.0 - 2022-06-25 +## 0.8.0 - Update `prost` dependency to `0.10`. - Minimum supported Rust version (MSRV) is now 1.57 due to transitive `time` dependency. -## 0.7.0 - 2022-03-01 +## 0.7.0 - Update `actix-web` dependency to `4`. -## 0.7.0-beta.5 - 2022-02-03 +## 0.7.0-beta.5 - Update `prost` dependency to `0.9`. - Update `actix-web` dependency to `4.0.0-rc.1`. -## 0.7.0-beta.4 - 2021-12-29 +## 0.7.0-beta.4 - Minimum supported Rust version (MSRV) is now 1.54. -## 0.7.0-beta.3 - 2021-12-12 +## 0.7.0-beta.3 - Update `actix-web` dependency to `4.0.0.beta-14`. [#209] [#209]: https://github.com/actix/actix-extras/pull/209 -## 0.7.0-beta.2 - 2021-10-21 +## 0.7.0-beta.2 - Bump `prost` version to 0.8. [#197] - Update `actix-web` dependency to v4.0.0-beta.10. [#203] @@ -42,7 +42,7 @@ [#197]: https://github.com/actix/actix-extras/pull/197 [#203]: https://github.com/actix/actix-extras/pull/203 -## 0.7.0-beta.1 - 2021-06-27 +## 0.7.0-beta.1 - Bump `prost` version to 0.7. [#144] - Update `actix-web` dependency to 4.0.0 beta. @@ -50,12 +50,12 @@ [#144]: https://github.com/actix/actix-extras/pull/144 -## 0.6.0 - 2020-09-11 +## 0.6.0 - Update `actix-web` dependency to 3.0.0. - Minimum supported Rust version (MSRV) is now 1.42.0 to use `matches!` macro. -## 0.6.0-alpha.1 - 2020-07-06 +## 0.6.0-alpha.1 - Update `actix-web` to 3.0.0-alpha.3 - Minimum supported Rust version(MSRV) is now 1.40.0. diff --git a/actix-protobuf/Cargo.toml b/actix-protobuf/Cargo.toml index 633697f2c8..44e9c363ec 100644 --- a/actix-protobuf/Cargo.toml +++ b/actix-protobuf/Cargo.toml @@ -9,9 +9,9 @@ description = "Protobuf payload extractor for Actix Web" keywords = ["actix", "web", "protobuf", "protocol", "rpc"] homepage = "https://actix.rs" repository = "https://github.com/actix/actix-extras.git" -license = "MIT OR Apache-2.0" -edition = "2018" -rust-version = "1.60" +license.workspace = true +edition.workspace = true +rust-version.workspace = true [package.metadata.docs.rs] rustdoc-args = ["--cfg", "docsrs"] diff --git a/actix-redis/CHANGES.md b/actix-redis/CHANGES.md index 6cda7ae748..4ddcc40873 100644 --- a/actix-redis/CHANGES.md +++ b/actix-redis/CHANGES.md @@ -1,18 +1,18 @@ # Changes -## Unreleased - 2022-xx-xx +## Unreleased - Update `redis-async` dependency to `0.14`. -- Minimum supported Rust version (MSRV) is now 1.60. +- Minimum supported Rust version (MSRV) is now 1.68. -## 0.12.0 - 2022-07-09 +## 0.12.0 - Update `actix` dependency to `0.13`. - Update `redis-async` dependency to `0.13`. - Update `tokio-util` dependency to `0.7`. - Minimum supported Rust version (MSRV) is now 1.57 due to transitive `time` dependency. -## 0.11.0 - 2022-03-15 +## 0.11.0 ### Removed @@ -24,22 +24,22 @@ [#212]: https://github.com/actix/actix-extras/pull/212 -## 0.10.0 - 2022-03-01 +## 0.10.0 - Update `actix-web` dependency to `4`. -## 0.10.0-beta.6 - 2022-02-07 +## 0.10.0-beta.6 - Update `actix-web` dependency to `4.0.0-rc.1`. -## 0.10.0-beta.5 - 2021-12-29 +## 0.10.0-beta.5 - Update `actix-web` dependency to `4.0.0.beta-18`. [#218] - Minimum supported Rust version (MSRV) is now 1.54. [#218]: https://github.com/actix/actix-extras/pull/218 -## 0.10.0-beta.4 - 2021-12-12 +## 0.10.0-beta.4 - A session will be created in Redis if and only if there is some data inside the session state. This reduces the performance impact of `RedisSession` on routes that do not leverage sessions. [#207] - Update `actix-web` dependency to `4.0.0.beta-14`. [#209] @@ -47,23 +47,23 @@ [#207]: https://github.com/actix/actix-extras/pull/207 [#209]: https://github.com/actix/actix-extras/pull/209 -## 0.10.0-beta.3 - 2021-10-21 +## 0.10.0-beta.3 - Update `actix-web` dependency to v4.0.0-beta.10. [#203] - Minimum supported Rust version (MSRV) is now 1.52. [#203]: https://github.com/actix/actix-extras/pull/203 -## 0.10.0-beta.2 - 2021-06-27 +## 0.10.0-beta.2 - No notable changes. -## 0.10.0-beta.1 - 2021-04-02 +## 0.10.0-beta.1 - Update `actix-web` dependency to 4.0.0 beta. - Minimum supported Rust version (MSRV) is now 1.46.0. -## 0.9.2 - 2021-03-21 +## 0.9.2 - Implement `std::error::Error` for `Error` [#135] - Allow the removal of `Max-Age` for session-only cookies. [#161] @@ -71,16 +71,16 @@ [#135]: https://github.com/actix/actix-extras/pull/135 [#161]: https://github.com/actix/actix-extras/pull/161 -## 0.9.1 - 2020-09-12 +## 0.9.1 - Enforce minimum redis-async version of 0.6.3 to workaround breaking patch change. -## 0.9.0 - 2020-09-11 +## 0.9.0 - Update `actix-web` dependency to 3.0.0. - Minimize `futures` dependency. -## 0.9.0-alpha.2 - 2020-05-17 +## 0.9.0-alpha.2 - Add `cookie_http_only` functionality to RedisSession builder, setting this to false allows JavaScript to access cookies. Defaults to true. @@ -89,14 +89,14 @@ - Update `tokio-util` to 0.3 - Minimum supported Rust version(MSRV) is now 1.40.0. -## 0.9.0-alpha.1 - 2020-03-28 +## 0.9.0-alpha.1 - Update `actix` to 0.10.0-alpha.2 - Update `actix-session` to 0.4.0-alpha.1 - Update `actix-web` to 3.0.0-alpha.1 - Update `time` to 0.2.9 -## 0.8.1 - 2020-02-18 +## 0.8.1 - Move `env_logger` dependency to dev-dependencies and update to 0.7 - Update `actix_web` to 2.0.0 from 2.0.0-rc diff --git a/actix-redis/Cargo.toml b/actix-redis/Cargo.toml index 039c0f1653..a89970e24b 100644 --- a/actix-redis/Cargo.toml +++ b/actix-redis/Cargo.toml @@ -3,13 +3,13 @@ name = "actix-redis" version = "0.12.0" authors = ["Nikolay Kim "] description = "Actor-based Redis client" -license = "MIT OR Apache-2.0" keywords = ["actix", "redis", "async"] homepage = "https://actix.rs" repository = "https://github.com/actix/actix-extras.git" categories = ["network-programming", "asynchronous"] -edition = "2018" -rust-version = "1.60" +license.workspace = true +edition.workspace = true +rust-version.workspace = true [package.metadata.docs.rs] rustdoc-args = ["--cfg", "docsrs"] diff --git a/actix-session/CHANGES.md b/actix-session/CHANGES.md index fff49b151a..2acbbb14e2 100644 --- a/actix-session/CHANGES.md +++ b/actix-session/CHANGES.md @@ -1,25 +1,25 @@ # Changes -## Unreleased - 2021-xx-xx +## Unreleased - Set secure attribute when adding a session removal cookie. - Update `redis` dependency to `0.22`. -- Minimum supported Rust version (MSRV) is now 1.60. +- Minimum supported Rust version (MSRV) is now 1.68. -## 0.7.2 - 2022-09-11 +## 0.7.2 - Set SameSite attribute when adding a session removal cookie. [#284] - Minimum supported Rust version (MSRV) is now 1.59 due to transitive `time` dependency. [#284]: https://github.com/actix/actix-extras/pull/284 -## 0.7.1 - 2022-07-24 +## 0.7.1 - Fix interaction between session state changes and renewal. [#265] [#265]: https://github.com/actix/actix-extras/pull/265 -## 0.7.0 - 2022-07-09 +## 0.7.0 - Added `TtlExtensionPolicy` enum to support different strategies for extending the TTL attached to the session state. `TtlExtensionPolicy::OnEveryRequest` now allows for long-lived sessions that do not expire if the user remains active. [#233] - `SessionLength` is now called `SessionLifecycle`. [#233] @@ -36,7 +36,7 @@ [#233]: https://github.com/actix/actix-extras/pull/233 -## 0.6.2 - 2022-03-25 +## 0.6.2 - Implement `SessionExt` for `GuardContext`. [#234] - `RedisSessionStore` will prevent connection timeouts from causing user-visible errors. [#235] @@ -46,11 +46,11 @@ [#236]: https://github.com/actix/actix-extras/pull/236 [#235]: https://github.com/actix/actix-extras/pull/235 -## 0.6.1 - 2022-03-21 +## 0.6.1 - No significant changes since `0.6.0`. -## 0.6.0 - 2022-03-15 +## 0.6.0 ### Added @@ -72,28 +72,28 @@ [#212]: https://github.com/actix/actix-extras/pull/212 -## 0.5.0 - 2022-03-01 +## 0.5.0 - Update `actix-web` dependency to `4`. -## 0.5.0-beta.8 - 2022-02-07 +## 0.5.0-beta.8 - Update `actix-web` dependency to `4.0.0-rc.1`. -## 0.5.0-beta.7 - 2021-12-29 +## 0.5.0-beta.7 - Update `actix-web` dependency to `4.0.0.beta-18`. [#218] - Minimum supported Rust version (MSRV) is now 1.54. [#218]: https://github.com/actix/actix-extras/pull/218 -## 0.5.0-beta.6 - 2021-12-18 +## 0.5.0-beta.6 - Update `actix-web` dependency to `4.0.0.beta-15`. [#216] [#216]: https://github.com/actix/actix-extras/pull/216 -## 0.5.0-beta.5 - 2021-12-12 +## 0.5.0-beta.5 - Update `actix-web` dependency to `4.0.0.beta-14`. [#209] - Remove `UserSession` implementation for `RequestHead`. [#209] @@ -102,11 +102,11 @@ [#207]: https://github.com/actix/actix-extras/pull/207 [#209]: https://github.com/actix/actix-extras/pull/209 -## 0.5.0-beta.4 - 2021-11-22 +## 0.5.0-beta.4 - No significant changes since `0.5.0-beta.3`. -## 0.5.0-beta.3 - 2021-10-21 +## 0.5.0-beta.3 - Impl `Clone` for `CookieSession`. [#201] - Update `actix-web` dependency to v4.0.0-beta.10. [#203] @@ -115,11 +115,11 @@ [#201]: https://github.com/actix/actix-extras/pull/201 [#203]: https://github.com/actix/actix-extras/pull/203 -## 0.5.0-beta.2 - 2021-06-27 +## 0.5.0-beta.2 - No notable changes. -## 0.5.0-beta.1 - 2021-04-02 +## 0.5.0-beta.1 - Add `Session::entries`. [#170] - Rename `Session::{set => insert}` to match standard hash map naming. [#170] @@ -132,7 +132,7 @@ [#170]: https://github.com/actix/actix-extras/pull/170 -## 0.4.1 - 2021-03-21 +## 0.4.1 - `Session::set_session` takes a `IntoIterator` instead of `Iterator`. [#105] - Fix calls to `session.purge()` from paths other than the one specified in the cookie. [#129] @@ -140,12 +140,12 @@ [#105]: https://github.com/actix/actix-extras/pull/105 [#129]: https://github.com/actix/actix-extras/pull/129 -## 0.4.0 - 2020-09-11 +## 0.4.0 - Update `actix-web` dependency to 3.0.0. - Minimum supported Rust version (MSRV) is now 1.42.0. -## 0.4.0-alpha.1 - 2020-03-14 +## 0.4.0-alpha.1 - Update the `time` dependency to 0.2.7 - Update the `actix-web` dependency to 3.0.0-alpha.1 diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml index 48bd9ab020..c0c9eebdd4 100644 --- a/actix-session/Cargo.toml +++ b/actix-session/Cargo.toml @@ -9,9 +9,9 @@ description = "Session management for Actix We" keywords = ["http", "web", "framework", "async", "session"] homepage = "https://actix.rs" repository = "https://github.com/actix/actix-extras.git" -license = "MIT OR Apache-2.0" -edition = "2018" -rust-version = "1.60" +license.workspace = true +edition.workspace = true +rust-version.workspace = true [package.metadata.docs.rs] rustdoc-args = ["--cfg", "docsrs"] diff --git a/actix-session/src/session.rs b/actix-session/src/session.rs index 3a056e1ba5..1cd20cd42d 100644 --- a/actix-session/src/session.rs +++ b/actix-session/src/session.rs @@ -46,7 +46,7 @@ use serde::{de::DeserializeOwned, Serialize}; pub struct Session(Rc>); /// Status of a [`Session`]. -#[derive(Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Clone, Default, PartialEq, Eq)] pub enum SessionStatus { /// Session state has been updated - the changes will have to be persisted to the backend. Changed, @@ -64,15 +64,10 @@ pub enum SessionStatus { Renewed, /// The session state has not been modified since its creation/retrieval. + #[default] Unchanged, } -impl Default for SessionStatus { - fn default() -> SessionStatus { - SessionStatus::Unchanged - } -} - #[derive(Default)] struct SessionInner { state: HashMap, @@ -218,6 +213,7 @@ impl Session { /// /// Values that match keys already existing on the session will be overwritten. Values should /// already be JSON serialized. + #[allow(clippy::needless_pass_by_ref_mut)] pub(crate) fn set_session( req: &mut ServiceRequest, data: impl IntoIterator, @@ -232,6 +228,7 @@ impl Session { /// This is a destructive operation - the session state is removed from the request extensions /// typemap, leaving behind a new empty map. It should only be used when the session is being /// finalised (i.e. in `SessionMiddleware`). + #[allow(clippy::needless_pass_by_ref_mut)] pub(crate) fn get_changes( res: &mut ServiceResponse, ) -> (SessionStatus, HashMap) { diff --git a/actix-session/src/storage/redis_rs.rs b/actix-session/src/storage/redis_rs.rs index 86db45a3e7..44332f8b48 100644 --- a/actix-session/src/storage/redis_rs.rs +++ b/actix-session/src/storage/redis_rs.rs @@ -261,6 +261,7 @@ impl RedisSessionStore { /// This helper method catches this case (`.is_connection_dropped`) to execute a retry. The /// retry will be executed on a fresh connection, therefore it is likely to succeed (or fail for /// a different more meaningful reason). + #[allow(clippy::needless_pass_by_ref_mut)] async fn execute_command(&self, cmd: &mut Cmd) -> RedisResult { let mut can_retry = true; diff --git a/actix-session/tests/opaque_errors.rs b/actix-session/tests/opaque_errors.rs index d0af675c54..e896d93cdd 100644 --- a/actix-session/tests/opaque_errors.rs +++ b/actix-session/tests/opaque_errors.rs @@ -69,15 +69,18 @@ impl SessionStore for MockStore { _session_state: HashMap, _ttl: &Duration, ) -> Result { - todo!() + #![allow(clippy::diverging_sub_expression)] + unimplemented!() } async fn update_ttl(&self, _session_key: &SessionKey, _ttl: &Duration) -> Result<(), Error> { - todo!() + #![allow(clippy::diverging_sub_expression)] + unimplemented!() } async fn delete(&self, _session_key: &SessionKey) -> Result<(), Error> { - todo!() + #![allow(clippy::diverging_sub_expression)] + unimplemented!() } } diff --git a/actix-settings/CHANGES.md b/actix-settings/CHANGES.md index 840e8d697b..904eeb37fc 100644 --- a/actix-settings/CHANGES.md +++ b/actix-settings/CHANGES.md @@ -1,17 +1,17 @@ # Changes -## Unreleased - 2022-xx-xx +## Unreleased - Rename `AtError => Error`. - Remove `AtResult` type alias. -- Minimum supported Rust version (MSRV) is now 1.60. +- Minimum supported Rust version (MSRV) is now 1.68. -## 0.6.0 - 2022-07-31 +## 0.6.0 - Update Actix Web dependencies to v4 ecosystem. - Rename `actix.ssl` settings object to `actix.tls`. - `NoSettings` is now marked `#[non_exhaustive]`. -## 0.5.2 - 2022-07-31 +## 0.5.2 - Adopted into @actix org from . diff --git a/actix-settings/Cargo.toml b/actix-settings/Cargo.toml index 337e578754..42c5099a4e 100644 --- a/actix-settings/Cargo.toml +++ b/actix-settings/Cargo.toml @@ -6,9 +6,9 @@ authors = [ "Rob Ede ", ] description = "Easily manage Actix Web's settings from a TOML file and environment variables" -license = "MIT OR Apache-2.0" -edition = "2018" -rust-version = "1.60" +license.workspace = true +edition.workspace = true +rust-version.workspace = true [package.metadata.docs.rs] rustdoc-args = ["--cfg", "docsrs"] diff --git a/actix-web-httpauth/CHANGES.md b/actix-web-httpauth/CHANGES.md index 712b74cf4b..8f973f4f6e 100644 --- a/actix-web-httpauth/CHANGES.md +++ b/actix-web-httpauth/CHANGES.md @@ -1,10 +1,10 @@ # Changes -## Unreleased - 2022-xx-xx +## Unreleased -- Minimum supported Rust version (MSRV) is now 1.60. +- Minimum supported Rust version (MSRV) is now 1.68. -## 0.8.0 - 2022-07-21 +## 0.8.0 - Removed `AuthExtractor` trait; implement `FromRequest` for your custom auth types. [#264] - `BasicAuth::user_id()` now returns `&str`. [#249] @@ -16,74 +16,74 @@ [#249]: https://github.com/actix/actix-extras/pull/249 [#264]: https://github.com/actix/actix-extras/pull/264 -## 0.7.0 - 2022-07-19 +## 0.7.0 - Auth validator functions now need to return `(Error, ServiceRequest)` in error cases. [#260] - Minimum supported Rust version (MSRV) is now 1.57 due to transitive `time` dependency. [#260]: https://github.com/actix/actix-extras/pull/260 -## 0.6.0 - 2022-03-01 +## 0.6.0 - Update `actix-web` dependency to `4`. -## 0.6.0-beta.8 - 2022-02-07 +## 0.6.0-beta.8 - Relax body type bounds on middleware impl. [#223] - Update `actix-web` dependency to `4.0.0-rc.1`. [#223]: https://github.com/actix/actix-extras/pull/223 -## 0.6.0-beta.7 - 2021-12-29 +## 0.6.0-beta.7 - Minimum supported Rust version (MSRV) is now 1.54. -## 0.6.0-beta.6 - 2021-12-18 +## 0.6.0-beta.6 - Update `actix-web` dependency to `4.0.0.beta-15`. [#216] [#216]: https://github.com/actix/actix-extras/pull/216 -## 0.6.0-beta.5 - 2021-12-12 +## 0.6.0-beta.5 - Update `actix-web` dependency to `4.0.0.beta-14`. [#209] [#209]: https://github.com/actix/actix-extras/pull/209 -## 0.6.0-beta.4 - 2021-11-22 +## 0.6.0-beta.4 - impl `AuthExtractor` trait for `Option` and `Result`. [#205] [#205]: https://github.com/actix/actix-extras/pull/205 -## 0.6.0-beta.3 - 2021-10-21 +## 0.6.0-beta.3 - Update `actix-web` dependency to v4.0.0-beta.10. [#203] - Minimum supported Rust version (MSRV) is now 1.52. [#203]: https://github.com/actix/actix-extras/pull/203 -## 0.6.0-beta.2 - 2021-06-27 +## 0.6.0-beta.2 - No notable changes. -## 0.6.0-beta.1 - 2021-04-02 +## 0.6.0-beta.1 - Update `actix-web` dependency to 4.0.0 beta. - Minimum supported Rust version (MSRV) is now 1.46.0. -## 0.5.1 - 2021-03-21 +## 0.5.1 - Correct error handling when extracting auth details from request. [#128] [#128]: https://github.com/actix/actix-extras/pull/128 -## 0.5.0 - 2020-09-11 +## 0.5.0 - Update `actix-web` dependency to 3.0.0. - Minimum supported Rust version (MSRV) is now 1.42.0. -## 0.4.2 - 2020-07-08 +## 0.4.2 - Update the `base64` dependency to 0.12 - AuthenticationError's status code is preserved when converting to a ResponseError @@ -92,11 +92,11 @@ [#69]: https://github.com/actix/actix-web-httpauth/pull/69 -## 0.4.1 - 2020-02-19 +## 0.4.1 - Move repository to actix-extras -## 0.4.0 - 2020-01-14 +## 0.4.0 - Depends on `actix-web = "^2.0"`, `actix-service = "^1.0"`, and `futures = "^0.3"` version now ([#14]) - Depends on `bytes = "^0.5"` and `base64 = "^0.11"` now diff --git a/actix-web-httpauth/Cargo.toml b/actix-web-httpauth/Cargo.toml index 59dca5d50b..00977f3f9c 100644 --- a/actix-web-httpauth/Cargo.toml +++ b/actix-web-httpauth/Cargo.toml @@ -10,9 +10,9 @@ keywords = ["http", "web", "framework", "authentication", "security"] homepage = "https://actix.rs" repository = "https://github.com/actix/actix-extras.git" categories = ["web-programming::http-server"] -license = "MIT OR Apache-2.0" -edition = "2018" -rust-version = "1.60" +license.workspace = true +edition.workspace = true +rust-version.workspace = true [package.metadata.docs.rs] rustdoc-args = ["--cfg", "docsrs"] diff --git a/actix-web-httpauth/src/extractors/bearer.rs b/actix-web-httpauth/src/extractors/bearer.rs index e5610ff1e2..78ed3b6160 100644 --- a/actix-web-httpauth/src/extractors/bearer.rs +++ b/actix-web-httpauth/src/extractors/bearer.rs @@ -102,7 +102,7 @@ impl FromRequest for BearerAuth { let bearer = req .app_data::() .map(|config| config.0.clone()) - .unwrap_or_else(Default::default); + .unwrap_or_default(); AuthenticationError::new(bearer) }), diff --git a/actix-web-httpauth/src/headers/authorization/scheme/basic.rs b/actix-web-httpauth/src/headers/authorization/scheme/basic.rs index 4e5cbc6768..38e511adb1 100644 --- a/actix-web-httpauth/src/headers/authorization/scheme/basic.rs +++ b/actix-web-httpauth/src/headers/authorization/scheme/basic.rs @@ -55,7 +55,7 @@ impl Scheme for Basic { let mut parts = header.to_str()?.splitn(2, ' '); match parts.next() { - Some(scheme) if scheme == "Basic" => (), + Some("Basic") => (), _ => return Err(ParseError::MissingScheme), } diff --git a/actix-web-httpauth/src/headers/authorization/scheme/bearer.rs b/actix-web-httpauth/src/headers/authorization/scheme/bearer.rs index 4fac1888cf..13068b67f0 100644 --- a/actix-web-httpauth/src/headers/authorization/scheme/bearer.rs +++ b/actix-web-httpauth/src/headers/authorization/scheme/bearer.rs @@ -50,7 +50,7 @@ impl Scheme for Bearer { let mut parts = header.to_str()?.splitn(2, ' '); match parts.next() { - Some(scheme) if scheme == "Bearer" => {} + Some("Bearer") => {} _ => return Err(ParseError::MissingScheme), } diff --git a/clippy.toml b/clippy.toml deleted file mode 100644 index 13f202e9e5..0000000000 --- a/clippy.toml +++ /dev/null @@ -1 +0,0 @@ -msrv = "1.60" From 55d70231ccfddbe75e17e50e38049f6ae0f0ca41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Sep 2023 23:43:34 +0000 Subject: [PATCH 02/35] Bump taiki-e/install-action from 2.18.9 to 2.18.11 (#329) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.18.9 to 2.18.11. - [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.18.9...v2.18.11) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-post-merge.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index fee08077d3..b37e82edc4 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -35,7 +35,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.18.9 + - uses: taiki-e/install-action@v2.18.11 with: tool: cargo-hack @@ -77,7 +77,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.18.9 + - uses: taiki-e/install-action@v2.18.11 with: tool: cargo-hack diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e46663cf06..4bb631a78d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.18.9 + uses: taiki-e/install-action@v2.18.11 with: tool: cargo-hack @@ -100,7 +100,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.18.9 + uses: taiki-e/install-action@v2.18.11 with: tool: cargo-hack From 70b46280edf32d369cd274fe70f5fb8749fe182b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Sep 2023 23:54:02 +0000 Subject: [PATCH 03/35] Bump actions/checkout from 3 to 4 (#332) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-post-merge.yml | 4 ++-- .github/workflows/ci.yml | 6 +++--- .github/workflows/coverage.yml | 2 +- .github/workflows/lint.yml | 8 ++++---- .github/workflows/upload-doc.yml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index b37e82edc4..4a4e3dd71f 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -28,7 +28,7 @@ jobs: options: --entrypoint redis-server steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust (nightly) uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 @@ -70,7 +70,7 @@ jobs: runs-on: ${{ matrix.target.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust (nightly) uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4bb631a78d..ae6fc94eb8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: --entrypoint redis-server steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust (${{ matrix.version.name }}) uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 @@ -92,7 +92,7 @@ jobs: runs-on: ${{ matrix.target.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust (${{ matrix.version.name }}) uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 @@ -131,7 +131,7 @@ jobs: name: doc tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust (nightly) uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index d0fc4916f9..a320d83597 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -22,7 +22,7 @@ jobs: options: --entrypoint redis-server steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust (nightly) uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 976406e51f..f13030f75b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: fmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust (nightly) uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 @@ -26,7 +26,7 @@ jobs: clippy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 @@ -40,12 +40,12 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout ${{ github.base_ref }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.base_ref }} - name: checkout ${{ github.head_ref }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Rust (nightly) uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 diff --git a/.github/workflows/upload-doc.yml b/.github/workflows/upload-doc.yml index 20ec782c54..d09a3437a4 100644 --- a/.github/workflows/upload-doc.yml +++ b/.github/workflows/upload-doc.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust (nightly) uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 From d9214177262e0569c7efd77c973fcfa3b803d65a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Sep 2023 00:54:21 +0100 Subject: [PATCH 04/35] Bump JamesIves/github-pages-deploy-action from 3.7.1 to 4.4.3 (#330) Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 3.7.1 to 4.4.3. - [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases) - [Commits](https://github.com/jamesives/github-pages-deploy-action/compare/3.7.1...v4.4.3) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/upload-doc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-doc.yml b/.github/workflows/upload-doc.yml index d09a3437a4..3abf6d1c84 100644 --- a/.github/workflows/upload-doc.yml +++ b/.github/workflows/upload-doc.yml @@ -27,7 +27,7 @@ jobs: run: echo '' > target/doc/index.html - name: Deploy to GitHub Pages - uses: JamesIves/github-pages-deploy-action@3.7.1 + uses: JamesIves/github-pages-deploy-action@v4.4.3 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BRANCH: gh-pages From 257871ca7ab6dd1c78c58c085fd2dd557192dffe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Sep 2023 23:59:19 +0000 Subject: [PATCH 05/35] Update toml requirement from 0.5 to 0.8 (#335) * Update toml requirement from 0.5 to 0.8 Updates the requirements on [toml](https://github.com/toml-rs/toml) to permit the latest version. - [Commits](https://github.com/toml-rs/toml/compare/toml_datetime-v0.5.0...toml-v0.8.0) --- updated-dependencies: - dependency-name: toml dependency-type: direct:production ... Signed-off-by: dependabot[bot] * docs(settings): update changelog --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rob Ede --- actix-settings/CHANGES.md | 1 + actix-settings/Cargo.toml | 2 +- actix-settings/src/lib.rs | 3 ++- actix-settings/src/parse.rs | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/actix-settings/CHANGES.md b/actix-settings/CHANGES.md index 904eeb37fc..adf757f21b 100644 --- a/actix-settings/CHANGES.md +++ b/actix-settings/CHANGES.md @@ -4,6 +4,7 @@ - Rename `AtError => Error`. - Remove `AtResult` type alias. +- Update `toml` dependency to `0.8`. - Minimum supported Rust version (MSRV) is now 1.68. ## 0.6.0 diff --git a/actix-settings/Cargo.toml b/actix-settings/Cargo.toml index 42c5099a4e..5950dcb679 100644 --- a/actix-settings/Cargo.toml +++ b/actix-settings/Cargo.toml @@ -23,7 +23,7 @@ ioe = "0.5" once_cell = "1.13" regex = "1.5.5" serde = { version = "1", features = ["derive"] } -toml = "0.5" +toml = "0.8" [dev-dependencies] env_logger = "0.10" diff --git a/actix-settings/src/lib.rs b/actix-settings/src/lib.rs index a0d0e30241..3422549ff5 100644 --- a/actix-settings/src/lib.rs +++ b/actix-settings/src/lib.rs @@ -169,7 +169,8 @@ where /// Writes the default TOML template to a new file, located at `filepath`. /// /// # Errors - /// Returns a [`FileExists`](crate::AtError::FileExists) error if a file already exists at that + /// + /// Returns a [`FileExists`](crate::Error::FileExists) error if a file already exists at that /// location. pub fn write_toml_file

(filepath: P) -> AsResult<()> where diff --git a/actix-settings/src/parse.rs b/actix-settings/src/parse.rs index e88a64a3c0..b4433dd93d 100644 --- a/actix-settings/src/parse.rs +++ b/actix-settings/src/parse.rs @@ -2,7 +2,7 @@ use std::{path::PathBuf, str::FromStr}; use crate::Error; -/// A specialized `FromStr` trait that returns [`AtError`] errors +/// A specialized `FromStr` trait that returns [`Error`] errors pub trait Parse: Sized { /// Parse `Self` from `string`. fn parse(string: &str) -> Result; From 0d27e3a65a0f05ebb2024c9f726f095ba8240b94 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 16 Sep 2023 01:19:16 +0100 Subject: [PATCH 06/35] feat(settings): impl Error for Error --- actix-settings/CHANGES.md | 4 +++ actix-settings/Cargo.toml | 3 +- actix-settings/src/error.rs | 66 ++++++++++++++----------------------- 3 files changed, 29 insertions(+), 44 deletions(-) diff --git a/actix-settings/CHANGES.md b/actix-settings/CHANGES.md index adf757f21b..8efdeae489 100644 --- a/actix-settings/CHANGES.md +++ b/actix-settings/CHANGES.md @@ -5,6 +5,10 @@ - Rename `AtError => Error`. - Remove `AtResult` type alias. - Update `toml` dependency to `0.8`. +- Remove `ioe` dependency; `std::io::Error` is now used directly. +- Remove `Clone` implementation for `Error`. +- Implement `Display` for `Error`. +- Implement std's `Error` for `Error`. - Minimum supported Rust version (MSRV) is now 1.68. ## 0.6.0 diff --git a/actix-settings/Cargo.toml b/actix-settings/Cargo.toml index 5950dcb679..1c39ec9819 100644 --- a/actix-settings/Cargo.toml +++ b/actix-settings/Cargo.toml @@ -18,8 +18,7 @@ all-features = true actix-http = "3" actix-service = "2" actix-web = "4" - -ioe = "0.5" +derive_more = "0.99.7" once_cell = "1.13" regex = "1.5.5" serde = { version = "1", features = ["derive"] } diff --git a/actix-settings/src/error.rs b/actix-settings/src/error.rs index f59e355f07..7803dca434 100644 --- a/actix-settings/src/error.rs +++ b/actix-settings/src/error.rs @@ -1,18 +1,22 @@ use std::{env::VarError, io, num::ParseIntError, path::PathBuf, str::ParseBoolError}; +use derive_more::{Display, Error}; use toml::de::Error as TomlError; /// Errors that can be returned from methods in this crate. -#[derive(Debug, Clone)] +#[derive(Debug, Display, Error)] pub enum Error { /// Environment variable does not exists or is invalid. + #[display(fmt = "Env var error: {_0}")] EnvVarError(VarError), /// File already exists on disk. - FileExists(PathBuf), + #[display(fmt = "File exists: {}", "_0.display()")] + FileExists(#[error(not(source))] PathBuf), /// Invalid value. #[allow(missing_docs)] + #[display(fmt = "Expected {expected}, got {got} (@ {file}:{line}:{column})")] InvalidValue { expected: &'static str, got: String, @@ -22,18 +26,23 @@ pub enum Error { }, /// I/O error. - IoError(ioe::IoError), + #[display(fmt = "")] + IoError(io::Error), /// Value is not a boolean. + #[display(fmt = "Failed to parse boolean: {_0}")] ParseBoolError(ParseBoolError), /// Value is not an integer. + #[display(fmt = "Failed to parse integer: {_0}")] ParseIntError(ParseIntError), /// Value is not an address. - ParseAddressError(String), + #[display(fmt = "Failed to parse address: {_0}")] + ParseAddressError(#[error(not(source))] String), /// Error deserializing as TOML. + #[display(fmt = "TOML error: {_0}")] TomlError(TomlError), } @@ -51,12 +60,6 @@ macro_rules! InvalidValue { impl From for Error { fn from(err: io::Error) -> Self { - Self::IoError(ioe::IoError::from(err)) - } -} - -impl From for Error { - fn from(err: ioe::IoError) -> Self { Self::IoError(err) } } @@ -88,48 +91,27 @@ impl From for Error { impl From for io::Error { fn from(err: Error) -> Self { match err { - Error::EnvVarError(var_error) => { - let msg = format!("Env var error: {var_error}"); - io::Error::new(io::ErrorKind::InvalidInput, msg) - } + Error::EnvVarError(_) => io::Error::new(io::ErrorKind::InvalidInput, err.to_string()), - Error::FileExists(path_buf) => { - let msg = format!("File exists: {}", path_buf.display()); - io::Error::new(io::ErrorKind::AlreadyExists, msg) - } + Error::FileExists(_) => io::Error::new(io::ErrorKind::AlreadyExists, err.to_string()), - Error::InvalidValue { - expected, - ref got, - file, - line, - column, - } => { - let msg = format!("Expected {expected}, got {got} (@ {file}:{line}:{column})"); - io::Error::new(io::ErrorKind::InvalidInput, msg) + Error::InvalidValue { .. } => { + io::Error::new(io::ErrorKind::InvalidInput, err.to_string()) } - Error::IoError(io_error) => io_error.into(), + Error::IoError(io_error) => io_error, - Error::ParseBoolError(parse_bool_error) => { - let msg = format!("Failed to parse boolean: {parse_bool_error}"); - io::Error::new(io::ErrorKind::InvalidInput, msg) + Error::ParseBoolError(_) => { + io::Error::new(io::ErrorKind::InvalidInput, err.to_string()) } - Error::ParseIntError(parse_int_error) => { - let msg = format!("Failed to parse integer: {parse_int_error}"); - io::Error::new(io::ErrorKind::InvalidInput, msg) - } + Error::ParseIntError(_) => io::Error::new(io::ErrorKind::InvalidInput, err.to_string()), - Error::ParseAddressError(string) => { - let msg = format!("Failed to parse address: {string}"); - io::Error::new(io::ErrorKind::InvalidInput, msg) + Error::ParseAddressError(_) => { + io::Error::new(io::ErrorKind::InvalidInput, err.to_string()) } - Error::TomlError(toml_error) => { - let msg = format!("TOML error: {toml_error}"); - io::Error::new(io::ErrorKind::InvalidInput, msg) - } + Error::TomlError(_) => io::Error::new(io::ErrorKind::InvalidInput, err.to_string()), } } } From c029287801cad305612a2c464c8496d1a0ab18e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Sep 2023 00:25:08 +0000 Subject: [PATCH 07/35] Update prost requirement from 0.11 to 0.12 (#333) * Update prost requirement from 0.11 to 0.12 Updates the requirements on [prost](https://github.com/tokio-rs/prost) to permit the latest version. - [Release notes](https://github.com/tokio-rs/prost/releases) - [Commits](https://github.com/tokio-rs/prost/compare/prost-build-0.11.1...v0.12.1) --- updated-dependencies: - dependency-name: prost dependency-type: direct:production ... Signed-off-by: dependabot[bot] * docs: update changelog --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rob Ede --- actix-protobuf/CHANGES.md | 1 + actix-protobuf/Cargo.toml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/actix-protobuf/CHANGES.md b/actix-protobuf/CHANGES.md index bab17de3db..453bdd3f42 100644 --- a/actix-protobuf/CHANGES.md +++ b/actix-protobuf/CHANGES.md @@ -2,6 +2,7 @@ ## Unreleased +- Updated `prost` dependency to `0.12`. - Minimum supported Rust version (MSRV) is now 1.68. ## 0.9.0 diff --git a/actix-protobuf/Cargo.toml b/actix-protobuf/Cargo.toml index 44e9c363ec..51cf3a1bd4 100644 --- a/actix-protobuf/Cargo.toml +++ b/actix-protobuf/Cargo.toml @@ -21,8 +21,8 @@ all-features = true actix-web = { version = "4", default-features = false } derive_more = "0.99.7" futures-util = { version = "0.3.7", default-features = false } -prost = { version = "0.11", default-features = false } +prost = { version = "0.12", default-features = false } [dev-dependencies] actix-web = { version = "4", default-features = false, features = ["macros"] } -prost = { version = "0.11", default-features = false, features = ["prost-derive"] } +prost = { version = "0.12", default-features = false, features = ["prost-derive"] } From 55ace79d6455e667620f401f83c95c6bee8b9ad8 Mon Sep 17 00:00:00 2001 From: Max Karou Date: Sat, 16 Sep 2023 02:27:50 +0200 Subject: [PATCH 08/35] Implement `From` for `BasicAuth` (#327) * implement `From` for `BasicAuth` * update changelog --------- Co-authored-by: Rob Ede --- actix-web-httpauth/CHANGES.md | 1 + actix-web-httpauth/src/extractors/basic.rs | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/actix-web-httpauth/CHANGES.md b/actix-web-httpauth/CHANGES.md index 8f973f4f6e..d307ad7d6b 100644 --- a/actix-web-httpauth/CHANGES.md +++ b/actix-web-httpauth/CHANGES.md @@ -2,6 +2,7 @@ ## Unreleased +- Implement `From` for `BasicAuth`. - Minimum supported Rust version (MSRV) is now 1.68. ## 0.8.0 diff --git a/actix-web-httpauth/src/extractors/basic.rs b/actix-web-httpauth/src/extractors/basic.rs index 97890dda28..8b0f39ee8c 100644 --- a/actix-web-httpauth/src/extractors/basic.rs +++ b/actix-web-httpauth/src/extractors/basic.rs @@ -89,6 +89,12 @@ impl BasicAuth { } } +impl From for BasicAuth { + fn from(basic: Basic) -> Self { + Self(basic) + } +} + impl FromRequest for BasicAuth { type Future = Ready>; type Error = AuthenticationError; From b737452294e14ee4f92bc70006088697baa9140f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Sep 2023 00:30:20 +0000 Subject: [PATCH 09/35] Update redis requirement from 0.22 to 0.23 (#334) * Update redis requirement from 0.22 to 0.23 Updates the requirements on [redis](https://github.com/redis-rs/redis-rs) to permit the latest version. - [Release notes](https://github.com/redis-rs/redis-rs/releases) - [Commits](https://github.com/redis-rs/redis-rs/compare/redis-0.22.0...redis-0.23.3) --- updated-dependencies: - dependency-name: redis dependency-type: direct:production ... Signed-off-by: dependabot[bot] * docs: update changelog --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rob Ede --- actix-limitation/CHANGES.md | 2 +- actix-limitation/Cargo.toml | 2 +- actix-session/CHANGES.md | 2 +- actix-session/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/actix-limitation/CHANGES.md b/actix-limitation/CHANGES.md index db60aea41e..3c57ac2c29 100644 --- a/actix-limitation/CHANGES.md +++ b/actix-limitation/CHANGES.md @@ -2,7 +2,7 @@ ## Unreleased -- Update `redis` dependency to `0.22`. +- Update `redis` dependency to `0.23`. ## 0.4.0 diff --git a/actix-limitation/Cargo.toml b/actix-limitation/Cargo.toml index 0b0cf3d7d8..1ebb9ad692 100644 --- a/actix-limitation/Cargo.toml +++ b/actix-limitation/Cargo.toml @@ -28,7 +28,7 @@ actix-web = { version = "4", features = ["cookies"] } chrono = "0.4" derive_more = "0.99.7" log = "0.4" -redis = { version = "0.22", default-features = false, features = ["tokio-comp"] } +redis = { version = "0.23", default-features = false, features = ["tokio-comp"] } time = "0.3" # session diff --git a/actix-session/CHANGES.md b/actix-session/CHANGES.md index 2acbbb14e2..562a35e3c9 100644 --- a/actix-session/CHANGES.md +++ b/actix-session/CHANGES.md @@ -3,7 +3,7 @@ ## Unreleased - Set secure attribute when adding a session removal cookie. -- Update `redis` dependency to `0.22`. +- Update `redis` dependency to `0.23`. - Minimum supported Rust version (MSRV) is now 1.68. ## 0.7.2 diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml index c0c9eebdd4..4ca9e5d16b 100644 --- a/actix-session/Cargo.toml +++ b/actix-session/Cargo.toml @@ -43,7 +43,7 @@ actix-redis = { version = "0.12", optional = true } futures-core = { version = "0.3.7", default-features = false, optional = true } # redis-rs-session -redis = { version = "0.22", default-features = false, features = ["tokio-comp", "connection-manager"], optional = true } +redis = { version = "0.23", default-features = false, features = ["tokio-comp", "connection-manager"], optional = true } [dev-dependencies] actix-session = { path = ".", features = ["cookie-session", "redis-actor-session", "redis-rs-session"] } From f942d8a191c659edfa8b9f2f005e0987da5d0068 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Sep 2023 00:33:09 +0000 Subject: [PATCH 10/35] Update redis-async requirement from 0.14 to 0.16 (#336) * Update redis-async requirement from 0.14 to 0.16 Updates the requirements on [redis-async](https://github.com/benashford/redis-async-rs) to permit the latest version. - [Commits](https://github.com/benashford/redis-async-rs/commits) --- updated-dependencies: - dependency-name: redis-async dependency-type: direct:production ... Signed-off-by: dependabot[bot] * docs: update changelog --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rob Ede --- actix-redis/CHANGES.md | 2 +- actix-redis/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actix-redis/CHANGES.md b/actix-redis/CHANGES.md index 4ddcc40873..2bb3e17781 100644 --- a/actix-redis/CHANGES.md +++ b/actix-redis/CHANGES.md @@ -2,7 +2,7 @@ ## Unreleased -- Update `redis-async` dependency to `0.14`. +- Update `redis-async` dependency to `0.16`. - Minimum supported Rust version (MSRV) is now 1.68. ## 0.12.0 diff --git a/actix-redis/Cargo.toml b/actix-redis/Cargo.toml index a89970e24b..a1ceb78005 100644 --- a/actix-redis/Cargo.toml +++ b/actix-redis/Cargo.toml @@ -35,7 +35,7 @@ log = "0.4.6" backoff = "0.4.0" derive_more = "0.99.7" futures-core = { version = "0.3.7", default-features = false } -redis-async = "0.14" +redis-async = "0.16" time = "0.3" tokio = { version = "1.18.4", features = ["sync"] } tokio-util = "0.7" From 9fc34a9c48006f38950eacaf0f20e8e2550d4376 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 16 Sep 2023 03:07:01 +0100 Subject: [PATCH 11/35] chore(actix-protobuf): prepare release 0.10.0 --- actix-protobuf/CHANGES.md | 2 ++ actix-protobuf/Cargo.toml | 2 +- actix-protobuf/README.md | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/actix-protobuf/CHANGES.md b/actix-protobuf/CHANGES.md index 453bdd3f42..996b8c12a8 100644 --- a/actix-protobuf/CHANGES.md +++ b/actix-protobuf/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +## 0.10.0 + - Updated `prost` dependency to `0.12`. - Minimum supported Rust version (MSRV) is now 1.68. diff --git a/actix-protobuf/Cargo.toml b/actix-protobuf/Cargo.toml index 51cf3a1bd4..065fb22283 100644 --- a/actix-protobuf/Cargo.toml +++ b/actix-protobuf/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-protobuf" -version = "0.9.0" +version = "0.10.0" authors = [ "kingxsp ", "Yuki Okushi ", diff --git a/actix-protobuf/README.md b/actix-protobuf/README.md index c78144309b..dfb34a7997 100644 --- a/actix-protobuf/README.md +++ b/actix-protobuf/README.md @@ -3,9 +3,9 @@ > Protobuf payload extractor for Actix Web. [![crates.io](https://img.shields.io/crates/v/actix-protobuf?label=latest)](https://crates.io/crates/actix-protobuf) -[![Documentation](https://docs.rs/actix-protobuf/badge.svg?version=0.9.0)](https://docs.rs/actix-protobuf/0.9.0) +[![Documentation](https://docs.rs/actix-protobuf/badge.svg?version=0.10.0)](https://docs.rs/actix-protobuf/0.10.0) ![Apache 2.0 or MIT licensed](https://img.shields.io/crates/l/actix-protobuf) -[![Dependency Status](https://deps.rs/crate/actix-protobuf/0.9.0/status.svg)](https://deps.rs/crate/actix-protobuf/0.9.0) +[![Dependency Status](https://deps.rs/crate/actix-protobuf/0.10.0/status.svg)](https://deps.rs/crate/actix-protobuf/0.10.0) ## Documentation & Resources From 2a074ddf180a117dc4a0e4708fd4262e89bbdc01 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 16 Sep 2023 03:07:34 +0100 Subject: [PATCH 12/35] chore(actix-redis): prepare release 0.13.0 --- actix-redis/CHANGES.md | 2 ++ actix-redis/Cargo.toml | 2 +- actix-redis/README.md | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/actix-redis/CHANGES.md b/actix-redis/CHANGES.md index 2bb3e17781..7bd6b09bd5 100644 --- a/actix-redis/CHANGES.md +++ b/actix-redis/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +## 0.13.0 + - Update `redis-async` dependency to `0.16`. - Minimum supported Rust version (MSRV) is now 1.68. diff --git a/actix-redis/Cargo.toml b/actix-redis/Cargo.toml index a1ceb78005..9c91ea8ca8 100644 --- a/actix-redis/Cargo.toml +++ b/actix-redis/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-redis" -version = "0.12.0" +version = "0.13.0" authors = ["Nikolay Kim "] description = "Actor-based Redis client" keywords = ["actix", "redis", "async"] diff --git a/actix-redis/README.md b/actix-redis/README.md index deacdc857c..bf5827c377 100644 --- a/actix-redis/README.md +++ b/actix-redis/README.md @@ -3,9 +3,9 @@ > Actor-based Redis client. [![crates.io](https://img.shields.io/crates/v/actix-redis?label=latest)](https://crates.io/crates/actix-redis) -[![Documentation](https://docs.rs/actix-redis/badge.svg?version=0.12.0)](https://docs.rs/actix-redis/0.12.0) +[![Documentation](https://docs.rs/actix-redis/badge.svg?version=0.13.0)](https://docs.rs/actix-redis/0.13.0) ![Apache 2.0 or MIT licensed](https://img.shields.io/crates/l/actix-redis) -[![Dependency Status](https://deps.rs/crate/actix-redis/0.12.0/status.svg)](https://deps.rs/crate/actix-redis/0.12.0) +[![Dependency Status](https://deps.rs/crate/actix-redis/0.13.0/status.svg)](https://deps.rs/crate/actix-redis/0.13.0) ## Documentation & Resources From 600dda5ef3b3768b4cdf4c5406181a6a20af4e5e Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 16 Sep 2023 03:14:04 +0100 Subject: [PATCH 13/35] chore: correct futures-util dep specs --- actix-cors/Cargo.toml | 4 ++-- actix-protobuf/Cargo.toml | 2 +- actix-web-httpauth/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/actix-cors/Cargo.toml b/actix-cors/Cargo.toml index e446c377ad..9e47dcbaf1 100644 --- a/actix-cors/Cargo.toml +++ b/actix-cors/Cargo.toml @@ -25,10 +25,10 @@ actix-utils = "3" actix-web = { version = "4", default-features = false } derive_more = "0.99.7" -futures-util = { version = "0.3.7", default-features = false } +futures-util = { version = "0.3.17", default-features = false, features = ["std"] } log = "0.4" once_cell = "1" -smallvec = "1.6.1" +smallvec = "1" [dev-dependencies] actix-web = { version = "4", default-features = false, features = ["macros"] } diff --git a/actix-protobuf/Cargo.toml b/actix-protobuf/Cargo.toml index 065fb22283..4dec844ff1 100644 --- a/actix-protobuf/Cargo.toml +++ b/actix-protobuf/Cargo.toml @@ -20,7 +20,7 @@ all-features = true [dependencies] actix-web = { version = "4", default-features = false } derive_more = "0.99.7" -futures-util = { version = "0.3.7", default-features = false } +futures-util = { version = "0.3.17", default-features = false, features = ["std"] } prost = { version = "0.12", default-features = false } [dev-dependencies] diff --git a/actix-web-httpauth/Cargo.toml b/actix-web-httpauth/Cargo.toml index 00977f3f9c..da03dde473 100644 --- a/actix-web-httpauth/Cargo.toml +++ b/actix-web-httpauth/Cargo.toml @@ -24,7 +24,7 @@ actix-web = { version = "4.1", default-features = false } base64 = "0.21" futures-core = "0.3.7" -futures-util = { version = "0.3.7", default-features = false, features = ["std"] } +futures-util = { version = "0.3.17", default-features = false, features = ["std"] } log = "0.4" pin-project-lite = "0.2.7" From 94f99e4843de7d2c3757a5f768307803a74a8907 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 16 Sep 2023 03:14:40 +0100 Subject: [PATCH 14/35] chore(actix-web-httpauth): prepare release 0.8.1 --- actix-web-httpauth/CHANGES.md | 2 ++ actix-web-httpauth/Cargo.toml | 2 +- actix-web-httpauth/README.md | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/actix-web-httpauth/CHANGES.md b/actix-web-httpauth/CHANGES.md index d307ad7d6b..b96ca7778b 100644 --- a/actix-web-httpauth/CHANGES.md +++ b/actix-web-httpauth/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +## 0.8.1 + - Implement `From` for `BasicAuth`. - Minimum supported Rust version (MSRV) is now 1.68. diff --git a/actix-web-httpauth/Cargo.toml b/actix-web-httpauth/Cargo.toml index da03dde473..f666b62383 100644 --- a/actix-web-httpauth/Cargo.toml +++ b/actix-web-httpauth/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-web-httpauth" -version = "0.8.0" +version = "0.8.1" authors = [ "svartalf ", "Yuki Okushi ", diff --git a/actix-web-httpauth/README.md b/actix-web-httpauth/README.md index 55dd7a0a5c..d134fcd292 100644 --- a/actix-web-httpauth/README.md +++ b/actix-web-httpauth/README.md @@ -3,9 +3,9 @@ > HTTP authentication schemes for [Actix Web](https://actix.rs). [![crates.io](https://img.shields.io/crates/v/actix-web-httpauth?label=latest)](https://crates.io/crates/actix-web-httpauth) -[![Documentation](https://docs.rs/actix-web-httpauth/badge.svg?version=0.8.0)](https://docs.rs/actix-web-httpauth/0.8.0) +[![Documentation](https://docs.rs/actix-web-httpauth/badge.svg?version=0.8.1)](https://docs.rs/actix-web-httpauth/0.8.1) ![Apache 2.0 or MIT licensed](https://img.shields.io/crates/l/actix-web-httpauth) -[![Dependency Status](https://deps.rs/crate/actix-web-httpauth/0.8.0/status.svg)](https://deps.rs/crate/actix-web-httpauth/0.8.0) +[![Dependency Status](https://deps.rs/crate/actix-web-httpauth/0.8.1/status.svg)](https://deps.rs/crate/actix-web-httpauth/0.8.1) ## Documentation & Resources From 9e31f5b3064c83a1f157c7c1fa3283c9cafa5ded Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 16 Sep 2023 03:28:31 +0100 Subject: [PATCH 15/35] chore(actix-session): prepare release 0.8.0 --- actix-identity/CHANGES.md | 6 +++--- actix-identity/Cargo.toml | 4 ++-- actix-limitation/CHANGES.md | 1 + actix-limitation/Cargo.toml | 2 +- actix-session/CHANGES.md | 2 ++ actix-session/Cargo.toml | 2 +- actix-session/README.md | 4 ++-- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/actix-identity/CHANGES.md b/actix-identity/CHANGES.md index 655f2e1b18..d843820431 100644 --- a/actix-identity/CHANGES.md +++ b/actix-identity/CHANGES.md @@ -2,11 +2,11 @@ ## Unreleased -- Replace use of `anyhow::Error` with specific error types. [#296] +- Add `error` module. +- Replace use of `anyhow::Error` in return types with specific error types. +- Update `actix-session` dependency to `0.8`. - Minimum supported Rust version (MSRV) is now 1.68. -[#296]: https://github.com/actix/actix-extras/pull/296 - ## 0.5.2 - Fix visit deadline. [#263] diff --git a/actix-identity/Cargo.toml b/actix-identity/Cargo.toml index 3adfbdd0fe..fe79a76fff 100644 --- a/actix-identity/Cargo.toml +++ b/actix-identity/Cargo.toml @@ -19,7 +19,7 @@ all-features = true [dependencies] actix-service = "2" -actix-session = "0.7" +actix-session = "0.8" actix-utils = "3" actix-web = { version = "4", default-features = false, features = ["cookies", "secure-cookies"] } @@ -31,7 +31,7 @@ tracing = { version = "0.1.30", default-features = false, features = ["log"] } [dev-dependencies] actix-http = "3" actix-web = { version = "4", default-features = false, features = ["macros", "cookies", "secure-cookies"] } -actix-session = { version = "0.7", features = ["redis-rs-session", "cookie-session"] } +actix-session = { version = "0.8", features = ["redis-rs-session", "cookie-session"] } env_logger = "0.10" reqwest = { version = "0.11", default-features = false, features = ["cookies", "json"] } diff --git a/actix-limitation/CHANGES.md b/actix-limitation/CHANGES.md index 3c57ac2c29..fcf7beff01 100644 --- a/actix-limitation/CHANGES.md +++ b/actix-limitation/CHANGES.md @@ -3,6 +3,7 @@ ## Unreleased - Update `redis` dependency to `0.23`. +- Update `actix-session` dependency to `0.8`. ## 0.4.0 diff --git a/actix-limitation/Cargo.toml b/actix-limitation/Cargo.toml index 1ebb9ad692..2cc3a388a0 100644 --- a/actix-limitation/Cargo.toml +++ b/actix-limitation/Cargo.toml @@ -32,7 +32,7 @@ redis = { version = "0.23", default-features = false, features = ["tokio-comp"] time = "0.3" # session -actix-session = { version = "0.7", optional = true } +actix-session = { version = "0.8", optional = true } [dev-dependencies] actix-web = "4" diff --git a/actix-session/CHANGES.md b/actix-session/CHANGES.md index 562a35e3c9..cf840a9472 100644 --- a/actix-session/CHANGES.md +++ b/actix-session/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +## 0.8.0 + - Set secure attribute when adding a session removal cookie. - Update `redis` dependency to `0.23`. - Minimum supported Rust version (MSRV) is now 1.68. diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml index 4ca9e5d16b..d65ae31333 100644 --- a/actix-session/Cargo.toml +++ b/actix-session/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-session" -version = "0.7.2" +version = "0.8.0" authors = [ "Nikolay Kim ", "Luca Palmieri ", diff --git a/actix-session/README.md b/actix-session/README.md index 56e99eaa72..57103d1ec1 100644 --- a/actix-session/README.md +++ b/actix-session/README.md @@ -3,9 +3,9 @@ > Session management for Actix Web. [![crates.io](https://img.shields.io/crates/v/actix-session?label=latest)](https://crates.io/crates/actix-session) -[![Documentation](https://docs.rs/actix-session/badge.svg?version=0.7.2)](https://docs.rs/actix-session/0.7.2) +[![Documentation](https://docs.rs/actix-session/badge.svg?version=0.8.0)](https://docs.rs/actix-session/0.8.0) ![Apache 2.0 or MIT licensed](https://img.shields.io/crates/l/actix-session) -[![Dependency Status](https://deps.rs/crate/actix-session/0.7.2/status.svg)](https://deps.rs/crate/actix-session/0.7.2) +[![Dependency Status](https://deps.rs/crate/actix-session/0.8.0/status.svg)](https://deps.rs/crate/actix-session/0.8.0) ## Documentation & Resources From 9a7113028e09e77b00167c69f47bfa2bb5383e50 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 16 Sep 2023 03:29:31 +0100 Subject: [PATCH 16/35] chore(actix-identity): prepare release 0.6.0 --- actix-identity/CHANGES.md | 2 ++ actix-identity/Cargo.toml | 2 +- actix-identity/README.md | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/actix-identity/CHANGES.md b/actix-identity/CHANGES.md index d843820431..c06efddc43 100644 --- a/actix-identity/CHANGES.md +++ b/actix-identity/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +## 0.6.0 + - Add `error` module. - Replace use of `anyhow::Error` in return types with specific error types. - Update `actix-session` dependency to `0.8`. diff --git a/actix-identity/Cargo.toml b/actix-identity/Cargo.toml index fe79a76fff..cadff8f23f 100644 --- a/actix-identity/Cargo.toml +++ b/actix-identity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-identity" -version = "0.5.2" +version = "0.6.0" authors = [ "Nikolay Kim ", "Luca Palmieri ", diff --git a/actix-identity/README.md b/actix-identity/README.md index c3a7792b06..e373d80eb7 100644 --- a/actix-identity/README.md +++ b/actix-identity/README.md @@ -3,9 +3,9 @@ > Identity management for Actix Web. [![crates.io](https://img.shields.io/crates/v/actix-identity?label=latest)](https://crates.io/crates/actix-identity) -[![Documentation](https://docs.rs/actix-identity/badge.svg?version=0.5.2)](https://docs.rs/actix-identity/0.5.2) +[![Documentation](https://docs.rs/actix-identity/badge.svg?version=0.6.0)](https://docs.rs/actix-identity/0.6.0) ![Apache 2.0 or MIT licensed](https://img.shields.io/crates/l/actix-identity) -[![Dependency Status](https://deps.rs/crate/actix-identity/0.5.2/status.svg)](https://deps.rs/crate/actix-identity/0.5.2) +[![Dependency Status](https://deps.rs/crate/actix-identity/0.6.0/status.svg)](https://deps.rs/crate/actix-identity/0.6.0) ## Documentation & community resources From 3fad53211a3d184cd460368ae6fd74ce7e526034 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 16 Sep 2023 03:29:58 +0100 Subject: [PATCH 17/35] chore(actix-limitation): prepare release 0.5.0 --- actix-limitation/CHANGES.md | 2 ++ actix-limitation/Cargo.toml | 2 +- actix-limitation/README.md | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/actix-limitation/CHANGES.md b/actix-limitation/CHANGES.md index fcf7beff01..188743f195 100644 --- a/actix-limitation/CHANGES.md +++ b/actix-limitation/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +## 0.5.0 + - Update `redis` dependency to `0.23`. - Update `actix-session` dependency to `0.8`. diff --git a/actix-limitation/Cargo.toml b/actix-limitation/Cargo.toml index 2cc3a388a0..3e1b6d7590 100644 --- a/actix-limitation/Cargo.toml +++ b/actix-limitation/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-limitation" -version = "0.4.0" +version = "0.5.0" authors = [ "0xmad <0xmad@users.noreply.github.com>", "Rob Ede ", diff --git a/actix-limitation/README.md b/actix-limitation/README.md index 726c1b31d6..b937063af1 100644 --- a/actix-limitation/README.md +++ b/actix-limitation/README.md @@ -4,16 +4,16 @@ > Originally based on . [![crates.io](https://img.shields.io/crates/v/actix-limitation?label=latest)](https://crates.io/crates/actix-limitation) -[![Documentation](https://docs.rs/actix-limitation/badge.svg?version=0.4.0)](https://docs.rs/actix-limitation/0.4.0) +[![Documentation](https://docs.rs/actix-limitation/badge.svg?version=0.5.0)](https://docs.rs/actix-limitation/0.5.0) ![Apache 2.0 or MIT licensed](https://img.shields.io/crates/l/actix-limitation) -[![Dependency Status](https://deps.rs/crate/actix-limitation/0.4.0/status.svg)](https://deps.rs/crate/actix-limitation/0.4.0) +[![Dependency Status](https://deps.rs/crate/actix-limitation/0.5.0/status.svg)](https://deps.rs/crate/actix-limitation/0.5.0) ## Examples ```toml [dependencies] actix-web = "4" -actix-limitation = "0.3" +actix-limitation = "0.5" ``` ```rust From bafd8179ffa2d9dc39382eb0e8bb89f08a7d1b53 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 16 Sep 2023 03:35:56 +0100 Subject: [PATCH 18/35] chore: fix actix web feature specs --- actix-limitation/Cargo.toml | 2 +- actix-settings/Cargo.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/actix-limitation/Cargo.toml b/actix-limitation/Cargo.toml index 3e1b6d7590..fbc0c46601 100644 --- a/actix-limitation/Cargo.toml +++ b/actix-limitation/Cargo.toml @@ -23,7 +23,7 @@ session = ["actix-session"] [dependencies] actix-utils = "3" -actix-web = { version = "4", features = ["cookies"] } +actix-web = { version = "4", default-features = false, features = ["cookies"] } chrono = "0.4" derive_more = "0.99.7" diff --git a/actix-settings/Cargo.toml b/actix-settings/Cargo.toml index 1c39ec9819..117b2bb4b9 100644 --- a/actix-settings/Cargo.toml +++ b/actix-settings/Cargo.toml @@ -17,10 +17,10 @@ all-features = true [dependencies] actix-http = "3" actix-service = "2" -actix-web = "4" +actix-web = { version = "4", default-features = false } derive_more = "0.99.7" once_cell = "1.13" -regex = "1.5.5" +regex = "1.5" serde = { version = "1", features = ["derive"] } toml = "0.8" From 6caf37ceddabd67d3451cc87158394c330d05c12 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 16 Sep 2023 03:36:29 +0100 Subject: [PATCH 19/35] chore(actix-limitation): prepare release 0.5.1 --- actix-limitation/CHANGES.md | 4 ++++ actix-limitation/Cargo.toml | 2 +- actix-limitation/README.md | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/actix-limitation/CHANGES.md b/actix-limitation/CHANGES.md index 188743f195..88ef3ed38f 100644 --- a/actix-limitation/CHANGES.md +++ b/actix-limitation/CHANGES.md @@ -2,6 +2,10 @@ ## Unreleased +## 0.5.1 + +- No significant changes since `0.5.0`. + ## 0.5.0 - Update `redis` dependency to `0.23`. diff --git a/actix-limitation/Cargo.toml b/actix-limitation/Cargo.toml index fbc0c46601..90e6e9c554 100644 --- a/actix-limitation/Cargo.toml +++ b/actix-limitation/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-limitation" -version = "0.5.0" +version = "0.5.1" authors = [ "0xmad <0xmad@users.noreply.github.com>", "Rob Ede ", diff --git a/actix-limitation/README.md b/actix-limitation/README.md index b937063af1..7c4ba182bd 100644 --- a/actix-limitation/README.md +++ b/actix-limitation/README.md @@ -4,9 +4,9 @@ > Originally based on . [![crates.io](https://img.shields.io/crates/v/actix-limitation?label=latest)](https://crates.io/crates/actix-limitation) -[![Documentation](https://docs.rs/actix-limitation/badge.svg?version=0.5.0)](https://docs.rs/actix-limitation/0.5.0) +[![Documentation](https://docs.rs/actix-limitation/badge.svg?version=0.5.1)](https://docs.rs/actix-limitation/0.5.1) ![Apache 2.0 or MIT licensed](https://img.shields.io/crates/l/actix-limitation) -[![Dependency Status](https://deps.rs/crate/actix-limitation/0.5.0/status.svg)](https://deps.rs/crate/actix-limitation/0.5.0) +[![Dependency Status](https://deps.rs/crate/actix-limitation/0.5.1/status.svg)](https://deps.rs/crate/actix-limitation/0.5.1) ## Examples From 09ff35bd2d4ff8e0856cf2f97fb2916040c18dbe Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 16 Sep 2023 03:44:47 +0100 Subject: [PATCH 20/35] chore: fix tests for settings --- actix-settings/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/actix-settings/Cargo.toml b/actix-settings/Cargo.toml index 117b2bb4b9..781dc8e4eb 100644 --- a/actix-settings/Cargo.toml +++ b/actix-settings/Cargo.toml @@ -25,4 +25,5 @@ serde = { version = "1", features = ["derive"] } toml = "0.8" [dev-dependencies] +actix-web = "4" env_logger = "0.10" From 2dea1f2748b06fc66451f8195a29e1f307a57bad Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 16 Sep 2023 07:52:18 +0100 Subject: [PATCH 21/35] docs: update dep shields --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 3ca1822d84..b2c830bfd1 100644 --- a/README.md +++ b/README.md @@ -12,13 +12,13 @@ | Crate | | | | -------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- | | [actix-cors] | [![crates.io](https://img.shields.io/crates/v/actix-cors?label=latest)](https://crates.io/crates/actix-cors) [![dependency status](https://deps.rs/crate/actix-cors/0.6.4/status.svg)](https://deps.rs/crate/actix-cors/0.6.4) | Cross-Origin Resource Sharing (CORS) controls. | -| [actix-identity] | [![crates.io](https://img.shields.io/crates/v/actix-identity?label=latest)](https://crates.io/crates/actix-identity) [![dependency status](https://deps.rs/crate/actix-identity/0.5.2/status.svg)](https://deps.rs/crate/actix-identity/0.5.2) | Identity management. | -| [actix-limitation] | [![crates.io](https://img.shields.io/crates/v/actix-limitation?label=latest)](https://crates.io/crates/actix-limitation) [![dependency status](https://deps.rs/crate/actix-limitation/0.4.0/status.svg)](https://deps.rs/crate/actix-limitation/0.4.0) | Rate-limiting using a fixed window counter for arbitrary keys, backed by Redis. | -| [actix-protobuf] | [![crates.io](https://img.shields.io/crates/v/actix-protobuf?label=latest)](https://crates.io/crates/actix-protobuf) [![dependency status](https://deps.rs/crate/actix-protobuf/0.9.0/status.svg)](https://deps.rs/crate/actix-protobuf/0.9.0) | Protobuf payload extractor. | -| [actix-redis] | [![crates.io](https://img.shields.io/crates/v/actix-redis?label=latest)](https://crates.io/crates/actix-redis) [![dependency status](https://deps.rs/crate/actix-redis/0.12.0/status.svg)](https://deps.rs/crate/actix-redis/0.12.0) | Actor-based Redis client. | -| [actix-session] | [![crates.io](https://img.shields.io/crates/v/actix-session?label=latest)](https://crates.io/crates/actix-session) [![dependency status](https://deps.rs/crate/actix-session/0.7.2/status.svg)](https://deps.rs/crate/actix-session/0.7.2) | Session management. | +| [actix-identity] | [![crates.io](https://img.shields.io/crates/v/actix-identity?label=latest)](https://crates.io/crates/actix-identity) [![dependency status](https://deps.rs/crate/actix-identity/0.6.0/status.svg)](https://deps.rs/crate/actix-identity/0.6.0) | Identity management. | +| [actix-limitation] | [![crates.io](https://img.shields.io/crates/v/actix-limitation?label=latest)](https://crates.io/crates/actix-limitation) [![dependency status](https://deps.rs/crate/actix-limitation/0.5.1/status.svg)](https://deps.rs/crate/actix-limitation/0.5.1) | Rate-limiting using a fixed window counter for arbitrary keys, backed by Redis. | +| [actix-protobuf] | [![crates.io](https://img.shields.io/crates/v/actix-protobuf?label=latest)](https://crates.io/crates/actix-protobuf) [![dependency status](https://deps.rs/crate/actix-protobuf/0.10.0/status.svg)](https://deps.rs/crate/actix-protobuf/0.10.0) | Protobuf payload extractor. | +| [actix-redis] | [![crates.io](https://img.shields.io/crates/v/actix-redis?label=latest)](https://crates.io/crates/actix-redis) [![dependency status](https://deps.rs/crate/actix-redis/0.13.0/status.svg)](https://deps.rs/crate/actix-redis/0.13.0) | Actor-based Redis client. | +| [actix-session] | [![crates.io](https://img.shields.io/crates/v/actix-session?label=latest)](https://crates.io/crates/actix-session) [![dependency status](https://deps.rs/crate/actix-session/0.8.0/status.svg)](https://deps.rs/crate/actix-session/0.8.0) | Session management. | | [actix-settings] | [![crates.io](https://img.shields.io/crates/v/actix-settings?label=latest)](https://crates.io/crates/actix-settings) [![dependency status](https://deps.rs/crate/actix-settings/0.6.0/status.svg)](https://deps.rs/crate/actix-settings/0.6.0) | Easily manage Actix Web's settings from a TOML file and environment variables. | -| [actix-web-httpauth] | [![crates.io](https://img.shields.io/crates/v/actix-web-httpauth?label=latest)](https://crates.io/crates/actix-web-httpauth) [![dependency status](https://deps.rs/crate/actix-web-httpauth/0.8.0/status.svg)](https://deps.rs/crate/actix-web-httpauth/0.8.0) | HTTP authentication schemes. | +| [actix-web-httpauth] | [![crates.io](https://img.shields.io/crates/v/actix-web-httpauth?label=latest)](https://crates.io/crates/actix-web-httpauth) [![dependency status](https://deps.rs/crate/actix-web-httpauth/0.8.1/status.svg)](https://deps.rs/crate/actix-web-httpauth/0.8.1) | HTTP authentication schemes. | --- @@ -30,19 +30,19 @@ These crates are provided by the community. | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | | [actix-web-lab] | [![crates.io](https://img.shields.io/crates/v/actix-web-lab?label=latest)][actix-web-lab] [![dependency status](https://deps.rs/crate/actix-web-lab/0.19.1/status.svg)](https://deps.rs/crate/actix-web-lab/0.19.1) | Experimental extractors, middleware, and other extras for possible inclusion in Actix Web. | | [actix-multipart-extract] | [![crates.io](https://img.shields.io/crates/v/actix-multipart-extract?label=latest)][actix-multipart-extract] [![dependency status](https://deps.rs/crate/actix-multipart-extract/0.1.5/status.svg)](https://deps.rs/crate/actix-multipart-extract/0.1.5) | Better multipart form support for Actix Web. | -| [actix-form-data] | [![crates.io](https://img.shields.io/crates/v/actix-form-data?label=latest)][actix-form-data] [![dependency status](https://deps.rs/crate/actix-form-data/0.7.0-beta.0/status.svg)](https://deps.rs/crate/actix-form-data/0.7.0-beta.0) | Multipart form data from actix multipart streams | -| [actix-governor] | [![crates.io](https://img.shields.io/crates/v/actix-governor?label=latest)][actix-governor] [![dependency status](https://deps.rs/crate/actix-governor/0.4.0/status.svg)](https://deps.rs/crate/actix-governor/0.4.0) | Rate-limiting backed by governor. | +| [actix-form-data] | [![crates.io](https://img.shields.io/crates/v/actix-form-data?label=latest)][actix-form-data] [![dependency status](https://deps.rs/crate/actix-form-data/0.7.0-beta.4/status.svg)](https://deps.rs/crate/actix-form-data/0.7.0-beta.4) | Multipart form data from actix multipart streams | +| [actix-governor] | [![crates.io](https://img.shields.io/crates/v/actix-governor?label=latest)][actix-governor] [![dependency status](https://deps.rs/crate/actix-governor/0.5.1/status.svg)](https://deps.rs/crate/actix-governor/0.5.1) | Rate-limiting backed by governor. | | [actix-casbin] | [![crates.io](https://img.shields.io/crates/v/actix-casbin?label=latest)][actix-casbin] [![dependency status](https://deps.rs/crate/actix-casbin/0.4.2/status.svg)](https://deps.rs/crate/actix-casbin/0.4.2) | Authorization library that supports access control models like ACL, RBAC & ABAC. | | [actix-ip-filter] | [![crates.io](https://img.shields.io/crates/v/actix-ip-filter?label=latest)][actix-ip-filter] [![dependency status](https://deps.rs/crate/actix-ip-filter/0.3.1/status.svg)](https://deps.rs/crate/actix-ip-filter/0.3.1) | IP address filter. Supports glob patterns. | | [actix-web-static-files] | [![crates.io](https://img.shields.io/crates/v/actix-web-static-files?label=latest)][actix-web-static-files] [![dependency status](https://deps.rs/crate/actix-web-static-files/4.0.1/status.svg)](https://deps.rs/crate/actix-web-static-files/4.0.1) | Static files as embedded resources. | -| [actix-web-grants] | [![crates.io](https://img.shields.io/crates/v/actix-web-grants?label=latest)][actix-web-grants] [![dependency status](https://deps.rs/crate/actix-web-grants/3.0.1/status.svg)](https://deps.rs/crate/actix-web-grants/3.0.1) | Extension for validating user authorities. | -| [aliri_actix] | [![crates.io](https://img.shields.io/crates/v/aliri_actix?label=latest)][aliri_actix] [![dependency status](https://deps.rs/crate/aliri_actix/0.8.0/status.svg)](https://deps.rs/crate/aliri_actix/0.8.0) | Endpoint authorization and authentication using scoped OAuth2 JWT tokens. | +| [actix-web-grants] | [![crates.io](https://img.shields.io/crates/v/actix-web-grants?label=latest)][actix-web-grants] [![dependency status](https://deps.rs/crate/actix-web-grants/3.0.2/status.svg)](https://deps.rs/crate/actix-web-grants/3.0.2) | Extension for validating user authorities. | +| [aliri_actix] | [![crates.io](https://img.shields.io/crates/v/aliri_actix?label=latest)][aliri_actix] [![dependency status](https://deps.rs/crate/aliri_actix/0.9.0/status.svg)](https://deps.rs/crate/aliri_actix/0.9.0) | Endpoint authorization and authentication using scoped OAuth2 JWT tokens. | | [actix-web-flash-messages] | [![crates.io](https://img.shields.io/crates/v/actix-web-flash-messages?label=latest)][actix-web-flash-messages] [![dependency status](https://deps.rs/crate/actix-web-flash-messages/0.4.2/status.svg)](https://deps.rs/crate/actix-web-flash-messages/0.4.2) | Support for flash messages/one-time notifications in `actix-web`. | | [awmp] | [![crates.io](https://img.shields.io/crates/v/awmp?label=latest)][awmp] [![dependency status](https://deps.rs/crate/awmp/0.8.1/status.svg)](https://deps.rs/crate/awmp/0.8.1) | An easy to use wrapper around multipart fields for Actix Web. | -| [tracing-actix-web] | [![crates.io](https://img.shields.io/crates/v/tracing-actix-web?label=latest)][tracing-actix-web] [![dependency status](https://deps.rs/crate/tracing-actix-web/0.7.3/status.svg)](https://deps.rs/crate/tracing-actix-web/0.7.3) | A middleware to collect telemetry data from applications built on top of the actix-web framework. | +| [tracing-actix-web] | [![crates.io](https://img.shields.io/crates/v/tracing-actix-web?label=latest)][tracing-actix-web] [![dependency status](https://deps.rs/crate/tracing-actix-web/0.7.6/status.svg)](https://deps.rs/crate/tracing-actix-web/0.7.6) | A middleware to collect telemetry data from applications built on top of the Actix Web framework. | | [actix-ws] | [![crates.io](https://img.shields.io/crates/v/actix-ws?label=latest)][actix-ws] [![dependency status](https://deps.rs/crate/actix-ws/0.2.5/status.svg)](https://deps.rs/crate/actix-ws/0.2.5) | Actor-less WebSockets for the Actix Runtime. | | [actix-hash] | [![crates.io](https://img.shields.io/crates/v/actix-hash?label=latest)][actix-hash] [![dependency status](https://deps.rs/crate/actix-hash/0.5.0/status.svg)](https://deps.rs/crate/actix-hash/0.5.0) | Hashing utilities for Actix Web. | -| [actix-bincode] | ![crates.io](https://img.shields.io/crates/v/actix-bincode?label=latest) [![dependency status](https://deps.rs/crate/actix-bincode/0.2.1/status.svg)](https://deps.rs/crate/actix-bincode/0.2.1) | Bincode payload extractor for Actix Web | +| [actix-bincode] | ![crates.io](https://img.shields.io/crates/v/actix-bincode?label=latest) [![dependency status](https://deps.rs/crate/actix-bincode/0.2.2/status.svg)](https://deps.rs/crate/actix-bincode/0.2.2) | Bincode payload extractor for Actix Web | | [sentinel-actix] | ![crates.io](https://img.shields.io/crates/v/sentinel-actix?label=latest) [![dependency status](https://deps.rs/crate/sentinel-actix/0.1.0/status.svg)](https://deps.rs/crate/sentinel-actix/0.1.0) | General and flexible protection for Actix Web | To add a crate to this list, submit a pull request. From 5baa3c3d95171423859b61d9313283a25b2cbb09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 16:20:24 +0100 Subject: [PATCH 22/35] Bump taiki-e/cache-cargo-install-action from 1.2.1 to 1.2.2 (#337) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f13030f75b..2e848ac19f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -53,7 +53,7 @@ jobs: toolchain: nightly - name: Install cargo-public-api - uses: taiki-e/cache-cargo-install-action@v1.2.1 + uses: taiki-e/cache-cargo-install-action@v1.2.2 with: tool: cargo-public-api From 316c0d238d4044588df0c7b687791500c4d6a57e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 16:20:41 +0100 Subject: [PATCH 23/35] Bump taiki-e/install-action from 2.18.11 to 2.18.13 (#338) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-post-merge.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index 4a4e3dd71f..34e53c3e6f 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -35,7 +35,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.18.11 + - uses: taiki-e/install-action@v2.18.13 with: tool: cargo-hack @@ -77,7 +77,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.18.11 + - uses: taiki-e/install-action@v2.18.13 with: tool: cargo-hack diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae6fc94eb8..634285a4ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.18.11 + uses: taiki-e/install-action@v2.18.13 with: tool: cargo-hack @@ -100,7 +100,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.18.11 + uses: taiki-e/install-action@v2.18.13 with: tool: cargo-hack From 1d6ef8938fe83065e63854bb8dcfa8d625fb24ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:12:18 +0100 Subject: [PATCH 24/35] Bump taiki-e/install-action from 2.18.13 to 2.18.14 (#339) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.18.13 to 2.18.14. - [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.18.13...v2.18.14) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-post-merge.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index 34e53c3e6f..b529e7c5df 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -35,7 +35,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.18.13 + - uses: taiki-e/install-action@v2.18.14 with: tool: cargo-hack @@ -77,7 +77,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.18.13 + - uses: taiki-e/install-action@v2.18.14 with: tool: cargo-hack diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 634285a4ce..35c3ca1558 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.18.13 + uses: taiki-e/install-action@v2.18.14 with: tool: cargo-hack @@ -100,7 +100,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.18.13 + uses: taiki-e/install-action@v2.18.14 with: tool: cargo-hack From 45ee50f9cb2481e45b2ba466205dba1df4b457e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Sep 2023 17:46:27 +0100 Subject: [PATCH 25/35] Bump taiki-e/install-action from 2.18.14 to 2.18.15 (#340) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.18.14 to 2.18.15. - [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.18.14...v2.18.15) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-post-merge.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index b529e7c5df..c3a422514f 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -35,7 +35,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.18.14 + - uses: taiki-e/install-action@v2.18.15 with: tool: cargo-hack @@ -77,7 +77,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.18.14 + - uses: taiki-e/install-action@v2.18.15 with: tool: cargo-hack diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35c3ca1558..ae5372349c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.18.14 + uses: taiki-e/install-action@v2.18.15 with: tool: cargo-hack @@ -100,7 +100,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.18.14 + uses: taiki-e/install-action@v2.18.15 with: tool: cargo-hack From cd3e5f9772bda83608911ae5479d7257ef3a5ec9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 16:24:50 +0100 Subject: [PATCH 26/35] Bump taiki-e/install-action from 2.18.15 to 2.18.16 (#341) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.18.15 to 2.18.16. - [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.18.15...v2.18.16) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-post-merge.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index c3a422514f..22f870e924 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -35,7 +35,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.18.15 + - uses: taiki-e/install-action@v2.18.16 with: tool: cargo-hack @@ -77,7 +77,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.18.15 + - uses: taiki-e/install-action@v2.18.16 with: tool: cargo-hack diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae5372349c..a6a0b51d49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.18.15 + uses: taiki-e/install-action@v2.18.16 with: tool: cargo-hack @@ -100,7 +100,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.18.15 + uses: taiki-e/install-action@v2.18.16 with: tool: cargo-hack From 9e4754bbfa53c5ad1ae05ea6e3c63ccd94a8fba4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 15:27:25 +0000 Subject: [PATCH 27/35] Bump taiki-e/install-action from 2.18.16 to 2.18.17 (#344) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.18.16 to 2.18.17. - [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.18.16...v2.18.17) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-post-merge.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index 22f870e924..feaa2b3b6c 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -35,7 +35,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.18.16 + - uses: taiki-e/install-action@v2.18.17 with: tool: cargo-hack @@ -77,7 +77,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.18.16 + - uses: taiki-e/install-action@v2.18.17 with: tool: cargo-hack diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6a0b51d49..7c7ec6d72e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.18.16 + uses: taiki-e/install-action@v2.18.17 with: tool: cargo-hack @@ -100,7 +100,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.18.16 + uses: taiki-e/install-action@v2.18.17 with: tool: cargo-hack From 1ee1afb2a6fa7041c1377207b8f0163c19f2de3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 15:49:25 +0000 Subject: [PATCH 28/35] Bump taiki-e/install-action from 2.18.17 to 2.19.1 (#345) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.18.17 to 2.19.1. - [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.18.17...v2.19.1) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-post-merge.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index feaa2b3b6c..2417f4efea 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -35,7 +35,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.18.17 + - uses: taiki-e/install-action@v2.19.1 with: tool: cargo-hack @@ -77,7 +77,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.18.17 + - uses: taiki-e/install-action@v2.19.1 with: tool: cargo-hack diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c7ec6d72e..1840db5f05 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.18.17 + uses: taiki-e/install-action@v2.19.1 with: tool: cargo-hack @@ -100,7 +100,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.18.17 + uses: taiki-e/install-action@v2.19.1 with: tool: cargo-hack From 7db43782ceacdc06c630c7c54ee13ccfb6f49aa1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 16:56:59 +0100 Subject: [PATCH 29/35] Bump taiki-e/install-action from 2.19.1 to 2.19.3 (#347) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.19.1 to 2.19.3. - [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.19.1...v2.19.3) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-post-merge.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index 2417f4efea..7e90b10e6e 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -35,7 +35,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.19.1 + - uses: taiki-e/install-action@v2.19.3 with: tool: cargo-hack @@ -77,7 +77,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.19.1 + - uses: taiki-e/install-action@v2.19.3 with: tool: cargo-hack diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1840db5f05..fe71ea8423 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.19.1 + uses: taiki-e/install-action@v2.19.3 with: tool: cargo-hack @@ -100,7 +100,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.19.1 + uses: taiki-e/install-action@v2.19.3 with: tool: cargo-hack From 3a7834c3ba6fe695bae2376560da3c70a97357b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Oct 2023 17:01:41 +0100 Subject: [PATCH 30/35] Bump taiki-e/install-action from 2.19.3 to 2.19.4 (#349) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-post-merge.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index 7e90b10e6e..04c5506d46 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -35,7 +35,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.19.3 + - uses: taiki-e/install-action@v2.19.4 with: tool: cargo-hack @@ -77,7 +77,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.19.3 + - uses: taiki-e/install-action@v2.19.4 with: tool: cargo-hack diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe71ea8423..7d4f86faab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.19.3 + uses: taiki-e/install-action@v2.19.4 with: tool: cargo-hack @@ -100,7 +100,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.19.3 + uses: taiki-e/install-action@v2.19.4 with: tool: cargo-hack From ec340670a8c288f7a644cc6cba440af10f1ecfd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 17:10:46 +0100 Subject: [PATCH 31/35] Bump taiki-e/install-action from 2.19.4 to 2.20.1 (#350) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.19.4 to 2.20.1. - [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.19.4...v2.20.1) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-post-merge.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index 04c5506d46..8099b2dc55 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -35,7 +35,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.19.4 + - uses: taiki-e/install-action@v2.20.1 with: tool: cargo-hack @@ -77,7 +77,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.19.4 + - uses: taiki-e/install-action@v2.20.1 with: tool: cargo-hack diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d4f86faab..e440c04bb1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.19.4 + uses: taiki-e/install-action@v2.20.1 with: tool: cargo-hack @@ -100,7 +100,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.19.4 + uses: taiki-e/install-action@v2.20.1 with: tool: cargo-hack From 4761826616b6ec63155d56c693f88527e92185b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 09:55:19 +0100 Subject: [PATCH 32/35] Bump taiki-e/install-action from 2.20.1 to 2.20.2 (#351) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.20.1 to 2.20.2. - [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.20.1...v2.20.2) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-post-merge.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index 8099b2dc55..5423d7a691 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -35,7 +35,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.20.1 + - uses: taiki-e/install-action@v2.20.2 with: tool: cargo-hack @@ -77,7 +77,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.20.1 + - uses: taiki-e/install-action@v2.20.2 with: tool: cargo-hack diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e440c04bb1..80a7014408 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.20.1 + uses: taiki-e/install-action@v2.20.2 with: tool: cargo-hack @@ -100,7 +100,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.20.1 + uses: taiki-e/install-action@v2.20.2 with: tool: cargo-hack From 9d993c6c736f9eac7b219befcdae464331caa0f8 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Fri, 13 Oct 2023 17:42:42 +0200 Subject: [PATCH 33/35] ci: reduce dependabot rate --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 23f6c3ea82..c7ecf5eaac 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,4 +7,4 @@ updates: - package-ecosystem: github-actions directory: / schedule: - interval: daily + interval: weekly From cb3eba93cc47a2ee83472ccb253c626751bead02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 15:43:04 +0000 Subject: [PATCH 34/35] Bump taiki-e/install-action from 2.20.2 to 2.20.3 (#352) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.20.2 to 2.20.3. - [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.20.2...v2.20.3) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-post-merge.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index 5423d7a691..ff0a5fd9fa 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -35,7 +35,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.20.2 + - uses: taiki-e/install-action@v2.20.3 with: tool: cargo-hack @@ -77,7 +77,7 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.20.2 + - uses: taiki-e/install-action@v2.20.3 with: tool: cargo-hack diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80a7014408..8571d05326 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.20.2 + uses: taiki-e/install-action@v2.20.3 with: tool: cargo-hack @@ -100,7 +100,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack - uses: taiki-e/install-action@v2.20.2 + uses: taiki-e/install-action@v2.20.3 with: tool: cargo-hack From 4bad825456f81e8e621bda912f96a33e80e29832 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 20:00:57 +0100 Subject: [PATCH 35/35] Bump taiki-e/cache-cargo-install-action from 1.2.2 to 1.3.0 (#353) Bumps [taiki-e/cache-cargo-install-action](https://github.com/taiki-e/cache-cargo-install-action) from 1.2.2 to 1.3.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](https://github.com/taiki-e/cache-cargo-install-action/compare/v1.2.2...v1.3.0) --- updated-dependencies: - dependency-name: taiki-e/cache-cargo-install-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2e848ac19f..51901f03ed 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -53,7 +53,7 @@ jobs: toolchain: nightly - name: Install cargo-public-api - uses: taiki-e/cache-cargo-install-action@v1.2.2 + uses: taiki-e/cache-cargo-install-action@v1.3.0 with: tool: cargo-public-api