From b9b628c47b4c0b35655590e3f418ee26cc5a1be8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 29 Oct 2023 05:08:55 +0000 Subject: [PATCH] Update criterion requirement from 0.4 to 0.5 (#495) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 23 +++++++++++++---------- actix-codec/Cargo.toml | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 356a950d..855420e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,10 +24,10 @@ jobs: - { name: Windows (MinGW), os: windows-latest, triple: x86_64-pc-windows-gnu } - { name: Windows (32-bit), os: windows-latest, triple: i686-pc-windows-msvc } version: - - 1.65.0 # MSRV - - stable + - { name: msrv, version: 1.65.0 } + - { name: stable, version: stable } - name: ${{ matrix.target.name }} / ${{ matrix.version }} + name: ${{ matrix.target.name }} / ${{ matrix.version.name }} runs-on: ${{ matrix.target.os }} env: {} @@ -52,10 +52,10 @@ jobs: echo 'OPENSSL_DIR=C:\Program Files\OpenSSL-Win64' | Out-File -FilePath $env:GITHUB_ENV -Append echo 'OPENSSL_DIR=C:\Program Files\OpenSSL' | Out-File -FilePath $env:GITHUB_ENV -Append - - name: Install Rust (${{ matrix.version }}) + - name: Install Rust (${{ matrix.version.name }}) uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 with: - toolchain: ${{ matrix.version }} + toolchain: ${{ matrix.version.version }} - uses: taiki-e/install-action@v2.21.2 with: @@ -65,9 +65,12 @@ jobs: run: cargo generate-lockfile - name: workaround MSRV issues - if: matrix.version != 'stable' + if: matrix.version.name == 'msrv' run: | - cargo update -p=time --precise=0.3.16 # time is only a dev dep so shouldn't affect msrv + cargo update -p=time --precise=0.3.16 + cargo update -p=clap --precise=4.3.24 + cargo update -p=clap_lex --precise=0.5.0 + cargo update -p=anstyle --precise=1.0.2 - name: check lib if: > @@ -106,9 +109,9 @@ jobs: ulimit -Sl 512 && ulimit -Hl 512 && PATH=$PATH:/usr/share/rust/.cargo/bin - && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-rustls-020 - && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-rustls-021 - && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-linux + && RUSTUP_TOOLCHAIN=${{ matrix.version.version }} cargo ci-test-rustls-020 + && RUSTUP_TOOLCHAIN=${{ matrix.version.version }} cargo ci-test-rustls-021 + && RUSTUP_TOOLCHAIN=${{ matrix.version.version }} cargo ci-test-linux " - name: Clear the cargo caches diff --git a/actix-codec/Cargo.toml b/actix-codec/Cargo.toml index d8f072df..f2261827 100644 --- a/actix-codec/Cargo.toml +++ b/actix-codec/Cargo.toml @@ -25,7 +25,7 @@ tokio-util = { version = "0.7", features = ["codec", "io"] } tracing = { version = "0.1.30", default-features = false, features = ["log"] } [dev-dependencies] -criterion = { version = "0.4", features = ["html_reports"] } +criterion = { version = "0.5", features = ["html_reports"] } tokio-test = "0.4.2" [[bench]]