fix: bump MSRV to 1.71.1 (#1119)

* bump msrv to 1.71.1

* add ci check

* rm windows

* refactor msrv check

* use cargo-msrv

* add names to steps

* apply clippy suggestions

* rm redundant import

* clippy::use_self

* clippy::cast_lossless

* clippy::match_same_arms

* apply clippy suggestions

* reuse old var

* refactor old code

* badge for license, version, downloads

* rm broken tokei loc badge

* add changelog

* clippy::derive_partial_eq_without_eq

* clippy::string_lit_as_bytes

* clippy::empty_line_after_doc_comments

* clippy::cloned_instead_of_copied

* clippy::unreadable_literal

* clippy::single_match_else

* expect over unwrap

* use let-else

* use ok_or_else

* propagate None

* clippy::match_same_arms

* return precise error

* rm downcast in favor of let-else

* chore: add unclog for 1101 + move 1118 under breaking-changes

* add msrv in clippy config

* update changelog

* use into over from

* clippy::redundant_closure_for_method_calls

---------

Co-authored-by: Farhad Shabani <[email protected]>

Author: rnbguy

.changelog/unreleased/breaking-changes/1118-bump-msrv.md

@@ -0,0 +1,2 @@
+- [ibc] Increase minimum supported Rust version to 1.71.1
+  ([\#1118](https://github.com/cosmos/ibc-rs/issues/1118))

.changelog/unreleased/improvements/1101-use-let-else-over-downcast.md

@@ -0,0 +1,2 @@
+- [ibc-primitives] Use `let-else` over `downcast!()` and remove `utils/macros`
+  module as a result ([\#1118](https://github.com/cosmos/ibc-rs/issues/1118))

.changelog/unreleased/improvements/1120-rm-redundant-shadowing.md

@@ -0,0 +1,2 @@
+- [ibc-core] Remove unnecessary shadowing with same value
+  ([\#1120](https://github.com/cosmos/ibc-rs/issues/1120))

.github/workflows/rust.yml

@@ -157,3 +157,48 @@ jobs:
         with:
           command: test
           args: --no-default-features --no-fail-fast --no-run
+
+  test-msrv:
+    timeout-minutes: 30
+    env:
+      CARGO_MSRV_VERSION: 0.16.0-beta.20
+      MSRV: 1.71.1
+    strategy:
+      matrix:
+        param:
+          [
+            { os: ubuntu-latest, system: unknown-linux-gnu },
+            { os: macos-latest, system: apple-darwin },
+          ]
+    runs-on: ${{ matrix.param.os }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Download cargo-msrv
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: foresterre/cargo-msrv
+          version: "tags/v${{ env.CARGO_MSRV_VERSION }}"
+          file: "cargo-msrv-x86_64-${{ matrix.param.system }}-v${{ env.CARGO_MSRV_VERSION }}.tgz"
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ env.MSRV }}
+          override: true
+      - uses: Swatinem/rust-cache@v1
+
+      - name: Install cargo-msrv
+        run: |
+          tar -xzf "cargo-msrv-x86_64-${{ matrix.param.system }}-v${{ env.CARGO_MSRV_VERSION }}.tgz"
+          mv "cargo-msrv-x86_64-${{ matrix.param.system }}-v${{ env.CARGO_MSRV_VERSION }}/cargo-msrv" ~/.cargo/bin
+          cargo msrv --version
+
+      - name: Calculate MSRV
+        run: cargo msrv --output-format minimal --min 1.64.0
+
+      - name: Build with MSRV
+        uses: actions-rs/cargo@v1
+        with:
+          toolchain: ${{ env.MSRV }}
+          command: build
+          args: --all-features

Cargo.toml

@@ -43,7 +43,7 @@ exclude = [
 version      = "0.50.0"
 license      = "Apache-2.0"
 edition      = "2021"
-rust-version = "1.64"
+rust-version = "1.71.1"
 readme       = "README.md"
 repository   = "https://github.com/cosmos/ibc-rs"
 authors      = ["Informal Systems <[email protected]>"]

README.md

@@ -16,9 +16,9 @@
 [![Build Status][build-image]][build-link]
 [![Code Coverage][codecov-image]][codecov-link]
 [![Apache 2.0 Licensed][license-image]][license-link]
-![Rust Stable][rustc-image]
-![Rust 1.64+][rustc-version]
-![Lines of Code][loc-image]
+![Version][crates-io-version]
+![Downloads][crates-io-downloads]
+![Rust Stable][msrv-image]
 
 </div>
 </div>
@@ -94,11 +94,11 @@ specific language governing permissions and limitations under the License.
 [build-link]: https://github.com/cosmos/ibc-rs/actions?query=workflow%3ARust
 [codecov-image]: https://codecov.io/gh/cosmos/ibc-rs/branch/main/graph/badge.svg?token=wUm2aLCOu
 [codecov-link]: https://codecov.io/gh/cosmos/ibc-rs
-[loc-image]: https://tokei.rs/b1/github/cosmos/ibc-rs
-[license-image]: https://img.shields.io/badge/license-Apache2.0-blue.svg
+[license-image]: https://img.shields.io/crates/l/ibc
 [license-link]: https://github.com/cosmos/ibc-rs/blob/main/LICENSE
-[rustc-image]: https://img.shields.io/badge/rustc-stable-blue.svg
-[rustc-version]: https://img.shields.io/badge/rustc-1.60+-blue.svg
+[crates-io-version]: https://img.shields.io/crates/v/ibc.svg
+[crates-io-downloads]: https://img.shields.io/crates/d/ibc.svg
+[msrv-image]: https://img.shields.io/crates/msrv/ibc
 
 [//]: # (general links)
 [ibc]: https://github.com/cosmos/ibc

clippy.toml

@@ -7,3 +7,4 @@ disallowed-types = [
 disallowed-methods = [
     "std::time::Duration::as_secs_f64",
 ]
+msrv = "1.71.1"

ibc-apps/ics20-transfer/src/module.rs

@@ -170,13 +170,10 @@ pub fn on_recv_packet_execute(
     ctx_b: &mut impl TokenTransferExecutionContext,
     packet: &Packet,
 ) -> (ModuleExtras, Acknowledgement) {
-    let data = match serde_json::from_slice::<PacketData>(&packet.data) {
-        Ok(data) => data,
-        Err(_) => {
-            let ack =
-                AcknowledgementStatus::error(TokenTransferError::PacketDataDeserialization.into());
-            return (ModuleExtras::empty(), ack.into());
-        }
+    let Ok(data) = serde_json::from_slice::<PacketData>(&packet.data) else {
+        let ack =
+            AcknowledgementStatus::error(TokenTransferError::PacketDataDeserialization.into());
+        return (ModuleExtras::empty(), ack.into());
     };
 
     let (mut extras, ack) = match process_recv_packet_execute(ctx_b, packet, data.clone()) {
@@ -225,26 +222,21 @@ pub fn on_acknowledgement_packet_execute(
     acknowledgement: &Acknowledgement,
     _relayer: &Signer,
 ) -> (ModuleExtras, Result<(), TokenTransferError>) {
-    let data = match serde_json::from_slice::<PacketData>(&packet.data) {
-        Ok(data) => data,
-        Err(_) => {
-            return (
-                ModuleExtras::empty(),
-                Err(TokenTransferError::PacketDataDeserialization),
-            );
-        }
+    let Ok(data) = serde_json::from_slice::<PacketData>(&packet.data) else {
+        return (
+            ModuleExtras::empty(),
+            Err(TokenTransferError::PacketDataDeserialization),
+        );
     };
 
-    let acknowledgement =
-        match serde_json::from_slice::<AcknowledgementStatus>(acknowledgement.as_ref()) {
-            Ok(ack) => ack,
-            Err(_) => {
-                return (
-                    ModuleExtras::empty(),
-                    Err(TokenTransferError::AckDeserialization),
-                );
-            }
-        };
+    let Ok(acknowledgement) =
+        serde_json::from_slice::<AcknowledgementStatus>(acknowledgement.as_ref())
+    else {
+        return (
+            ModuleExtras::empty(),
+            Err(TokenTransferError::AckDeserialization),
+        );
+    };
 
     if !acknowledgement.is_successful() {
         if let Err(err) = refund_packet_token_execute(ctx, packet, &data) {
@@ -290,14 +282,11 @@ pub fn on_timeout_packet_execute(
     packet: &Packet,
     _relayer: &Signer,
 ) -> (ModuleExtras, Result<(), TokenTransferError>) {
-    let data = match serde_json::from_slice::<PacketData>(&packet.data) {
-        Ok(data) => data,
-        Err(_) => {
-            return (
-                ModuleExtras::empty(),
-                Err(TokenTransferError::PacketDataDeserialization),
-            );
-        }
+    let Ok(data) = serde_json::from_slice::<PacketData>(&packet.data) else {
+        return (
+            ModuleExtras::empty(),
+            Err(TokenTransferError::PacketDataDeserialization),
+        );
     };
 
     if let Err(err) = refund_packet_token_execute(ctx, packet, &data) {
@@ -347,7 +336,7 @@ mod test {
         // Check that it's the same output as ibc-go
         // Note: this also implicitly checks that the ack bytes are non-empty,
         // which would make the conversion to `Acknowledgement` panic
-        assert_eq!(ack_success, r#"{"result":"AQ=="}"#.as_bytes());
+        assert_eq!(ack_success, br#"{"result":"AQ=="}"#);
     }
 
     #[test]
@@ -361,7 +350,7 @@ mod test {
         // which would make the conversion to `Acknowledgement` panic
         assert_eq!(
             ack_error,
-            r#"{"error":"failed to deserialize packet data"}"#.as_bytes()
+            br#"{"error":"failed to deserialize packet data"}"#
         );
     }
 

ibc-apps/ics20-transfer/types/src/error.rs

@@ -84,12 +84,12 @@ impl std::error::Error for TokenTransferError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match &self {
             Self::ContextError(e) => Some(e),
-            Self::InvalidIdentifier(e) => Some(e),
-            Self::InvalidTracePortId {
+            Self::InvalidIdentifier(e)
+            | Self::InvalidTracePortId {
                 validation_error: e,
                 ..
-            } => Some(e),
-            Self::InvalidTraceChannelId {
+            }
+            | Self::InvalidTraceChannelId {
                 validation_error: e,
                 ..
             } => Some(e),

ibc-apps/ics721-nft-transfer/src/module.rs

@@ -172,13 +172,9 @@ pub fn on_recv_packet_execute(
     ctx_b: &mut impl NftTransferExecutionContext,
     packet: &Packet,
 ) -> (ModuleExtras, Acknowledgement) {
-    let data = match serde_json::from_slice::<PacketData>(&packet.data) {
-        Ok(data) => data,
-        Err(_) => {
-            let ack =
-                AcknowledgementStatus::error(NftTransferError::PacketDataDeserialization.into());
-            return (ModuleExtras::empty(), ack.into());
-        }
+    let Ok(data) = serde_json::from_slice::<PacketData>(&packet.data) else {
+        let ack = AcknowledgementStatus::error(NftTransferError::PacketDataDeserialization.into());
+        return (ModuleExtras::empty(), ack.into());
     };
 
     let (mut extras, ack) = match process_recv_packet_execute(ctx_b, packet, data.clone()) {
@@ -227,26 +223,21 @@ pub fn on_acknowledgement_packet_execute(
     acknowledgement: &Acknowledgement,
     _relayer: &Signer,
 ) -> (ModuleExtras, Result<(), NftTransferError>) {
-    let data = match serde_json::from_slice::<PacketData>(&packet.data) {
-        Ok(data) => data,
-        Err(_) => {
-            return (
-                ModuleExtras::empty(),
-                Err(NftTransferError::PacketDataDeserialization),
-            );
-        }
+    let Ok(data) = serde_json::from_slice::<PacketData>(&packet.data) else {
+        return (
+            ModuleExtras::empty(),
+            Err(NftTransferError::PacketDataDeserialization),
+        );
     };
 
-    let acknowledgement =
-        match serde_json::from_slice::<AcknowledgementStatus>(acknowledgement.as_ref()) {
-            Ok(ack) => ack,
-            Err(_) => {
-                return (
-                    ModuleExtras::empty(),
-                    Err(NftTransferError::AckDeserialization),
-                );
-            }
-        };
+    let Ok(acknowledgement) =
+        serde_json::from_slice::<AcknowledgementStatus>(acknowledgement.as_ref())
+    else {
+        return (
+            ModuleExtras::empty(),
+            Err(NftTransferError::AckDeserialization),
+        );
+    };
 
     if !acknowledgement.is_successful() {
         if let Err(err) = refund_packet_nft_execute(ctx, packet, &data) {
@@ -289,14 +280,11 @@ pub fn on_timeout_packet_execute(
     packet: &Packet,
     _relayer: &Signer,
 ) -> (ModuleExtras, Result<(), NftTransferError>) {
-    let data = match serde_json::from_slice::<PacketData>(&packet.data) {
-        Ok(data) => data,
-        Err(_) => {
-            return (
-                ModuleExtras::empty(),
-                Err(NftTransferError::PacketDataDeserialization),
-            );
-        }
+    let Ok(data) = serde_json::from_slice::<PacketData>(&packet.data) else {
+        return (
+            ModuleExtras::empty(),
+            Err(NftTransferError::PacketDataDeserialization),
+        );
     };
 
     if let Err(err) = refund_packet_nft_execute(ctx, packet, &data) {
@@ -346,7 +334,7 @@ mod test {
         // Check that it's the same output as ibc-go
         // Note: this also implicitly checks that the ack bytes are non-empty,
         // which would make the conversion to `Acknowledgement` panic
-        assert_eq!(ack_success, r#"{"result":"AQ=="}"#.as_bytes());
+        assert_eq!(ack_success, br#"{"result":"AQ=="}"#);
     }
 
     #[test]
@@ -359,7 +347,7 @@ mod test {
         // which would make the conversion to `Acknowledgement` panic
         assert_eq!(
             ack_error,
-            r#"{"error":"failed to deserialize packet data"}"#.as_bytes()
+            br#"{"error":"failed to deserialize packet data"}"#
         );
     }