diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml index 328ccacf3..6ca6c0708 100644 --- a/.github/workflows/msrv.yml +++ b/.github/workflows/msrv.yml @@ -14,6 +14,7 @@ jobs: matrix: version: - 1.40.0 + - 1.42.0 name: ${{ matrix.version }} - x86_64-unknown-linux-gnu runs-on: ubuntu-latest @@ -42,7 +43,17 @@ jobs: with: command: test args: --package=actix-cors - --package=actix-protobuf + --package=actix-identity --package=actix-redis + --package=actix-session --package=actix-web-httpauth --all-features --no-fail-fast -- --nocapture + + - name: tests (1.42.0) + if: matrix.version == '1.42.0' + uses: actions-rs/cargo@v1 + timeout-minutes: 40 + with: + command: test + args: --package=actix-protobuf + --all-features --no-fail-fast -- --nocapture diff --git a/Cargo.toml b/Cargo.toml index c732420a7..fe1f02214 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,3 +8,6 @@ members = [ "actix-session", "actix-web-httpauth", ] + +[patch.crates-io] +actix-session = { path = "actix-session" } diff --git a/actix-protobuf/CHANGES.md b/actix-protobuf/CHANGES.md index 1eeb1130d..c801b3384 100644 --- a/actix-protobuf/CHANGES.md +++ b/actix-protobuf/CHANGES.md @@ -1,5 +1,9 @@ # Changes +## unreleased + +* Minimum supported Rust version(MSRV) is now 1.42.0 to use `matches!` macro. + ## 0.6.0-alpha.1 (2020-07-06) * Update `actix-web` to 3.0.0-alpha.3 diff --git a/actix-protobuf/src/lib.rs b/actix-protobuf/src/lib.rs index a8f39c6a5..b67ae12ca 100644 --- a/actix-protobuf/src/lib.rs +++ b/actix-protobuf/src/lib.rs @@ -272,14 +272,12 @@ mod tests { impl PartialEq for ProtoBufPayloadError { fn eq(&self, other: &ProtoBufPayloadError) -> bool { match *self { - ProtoBufPayloadError::Overflow => match *other { - ProtoBufPayloadError::Overflow => true, - _ => false, - }, - ProtoBufPayloadError::ContentType => match *other { - ProtoBufPayloadError::ContentType => true, - _ => false, - }, + ProtoBufPayloadError::Overflow => { + matches!(*other, ProtoBufPayloadError::Overflow) + } + ProtoBufPayloadError::ContentType => { + matches!(*other, ProtoBufPayloadError::ContentType) + } _ => false, } }