diff options
author | 2022-01-23 10:28:06 -0800 | |
---|---|---|
committer | 2022-01-23 10:28:06 -0800 | |
commit | 000279dd5984e7f1de90c9225ddafdaea61ed0cb (patch) | |
tree | b00e66deef005f0fcc57e997bfd5c7ed8bc3857e | |
parent | 3e8055719ba2bccd7a08dfb9df7023bf7a48aaeb (diff) | |
download | cortex-m-000279dd5984e7f1de90c9225ddafdaea61ed0cb.tar.gz cortex-m-000279dd5984e7f1de90c9225ddafdaea61ed0cb.tar.zst cortex-m-000279dd5984e7f1de90c9225ddafdaea61ed0cb.zip |
Bump MSRV from 1.40 to 1.42, fix clippy::match_like_matches_macro
-rw-r--r-- | .github/bors.toml | 4 | ||||
-rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
-rw-r--r-- | .github/workflows/rt-ci.yml | 2 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | cortex-m-rt/README.md | 2 | ||||
-rw-r--r-- | cortex-m-rt/macros/src/lib.rs | 10 | ||||
-rw-r--r-- | cortex-m-rt/src/lib.rs | 2 | ||||
-rw-r--r-- | src/lib.rs | 2 |
8 files changed, 10 insertions, 16 deletions
diff --git a/.github/bors.toml b/.github/bors.toml index a398b4a..4402e95 100644 --- a/.github/bors.toml +++ b/.github/bors.toml @@ -3,9 +3,9 @@ delete_merged_branches = true required_approvals = 1 status = [ "ci-linux (stable)", - "ci-linux (1.40.0)", + "ci-linux (1.42.0)", "rt-ci-linux (stable)", - "rt-ci-linux (1.40.0)", + "rt-ci-linux (1.42.0)", "rt-ci-other-os (macOS-latest)", "rt-ci-other-os (windows-latest)", "rustfmt", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d65b0f..8caebd0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: include: # Test MSRV - - rust: 1.40.0 + - rust: 1.42.0 # Test nightly but don't fail - rust: nightly diff --git a/.github/workflows/rt-ci.yml b/.github/workflows/rt-ci.yml index 0e48b6b..8b95612 100644 --- a/.github/workflows/rt-ci.yml +++ b/.github/workflows/rt-ci.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: # All generated code should be running on stable now - rust: [nightly, stable, 1.40.0] + rust: [nightly, stable, 1.42.0] include: # Nightly is only for reference and allowed to fail @@ -11,7 +11,7 @@ This project is developed and maintained by the [Cortex-M team][team]. ## Minimum Supported Rust Version (MSRV) -This crate is guaranteed to compile on stable Rust 1.40 and up. It might compile with older versions but that may change in any new patch release. +This crate is guaranteed to compile on stable Rust 1.42 and up. It might compile with older versions but that may change in any new patch release. ## License diff --git a/cortex-m-rt/README.md b/cortex-m-rt/README.md index 9857720..34b0f17 100644 --- a/cortex-m-rt/README.md +++ b/cortex-m-rt/README.md @@ -11,7 +11,7 @@ This project is developed and maintained by the [Cortex-M team][team]. # Minimum Supported Rust Version (MSRV) -This crate is guaranteed to compile on stable Rust 1.40.0 and up. It *might* +This crate is guaranteed to compile on stable Rust 1.42.0 and up. It *might* compile with older versions but that may change in any new patch release. # License diff --git a/cortex-m-rt/macros/src/lib.rs b/cortex-m-rt/macros/src/lib.rs index f7d6e7e..24f3fa1 100644 --- a/cortex-m-rt/macros/src/lib.rs +++ b/cortex-m-rt/macros/src/lib.rs @@ -28,10 +28,7 @@ pub fn entry(args: TokenStream, input: TokenStream) -> TokenStream { && f.sig.variadic.is_none() && match f.sig.output { ReturnType::Default => false, - ReturnType::Type(_, ref ty) => match **ty { - Type::Never(_) => true, - _ => false, - }, + ReturnType::Type(_, ref ty) => matches!(**ty, Type::Never(_)), }; if !valid_signature { @@ -252,10 +249,7 @@ pub fn exception(args: TokenStream, input: TokenStream) -> TokenStream { && f.sig.variadic.is_none() && match f.sig.output { ReturnType::Default => false, - ReturnType::Type(_, ref ty) => match **ty { - Type::Never(_) => true, - _ => false, - }, + ReturnType::Type(_, ref ty) => matches!(**ty, Type::Never(_)), }; if !valid_signature { diff --git a/cortex-m-rt/src/lib.rs b/cortex-m-rt/src/lib.rs index 8003326..752d3d7 100644 --- a/cortex-m-rt/src/lib.rs +++ b/cortex-m-rt/src/lib.rs @@ -418,7 +418,7 @@ //! //! # Minimum Supported Rust Version (MSRV) //! -//! The MSRV of this release is Rust 1.40.0. +//! The MSRV of this release is Rust 1.42.0. // # Developer notes // @@ -52,7 +52,7 @@ //! //! # Minimum Supported Rust Version (MSRV) //! -//! This crate is guaranteed to compile on stable Rust 1.40 and up. It *might* +//! This crate is guaranteed to compile on stable Rust 1.42 and up. It *might* //! compile with older versions but that may change in any new patch release. #![cfg_attr(feature = "inline-asm", feature(asm))] |