From e1ea832341266b1625cd8db90316f24f2bbd9e9b Mon Sep 17 00:00:00 2001 From: Chih Cheng Liang Date: Fri, 5 Nov 2021 15:58:17 +0800 Subject: [PATCH] udpate toolchain to enable the array_map feature (#157) * udpate toolchain * fix ci lint stable: remove override and use toolchain --- .github/workflows/lints-stable.yml | 7 +++---- bus-mapping/src/operation.rs | 4 ++-- rust-toolchain | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/lints-stable.yml b/.github/workflows/lints-stable.yml index bd57a491bc..ce35a5d1c4 100644 --- a/.github/workflows/lints-stable.yml +++ b/.github/workflows/lints-stable.yml @@ -10,7 +10,7 @@ jobs: clippy: if: github.event.pull_request.draft == false - name: Clippy (1.53.0) + name: Clippy timeout-minutes: 30 runs-on: ubuntu-latest @@ -18,12 +18,11 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.53.0 components: clippy - override: true + override: false - name: Run clippy uses: actions-rs/clippy-check@v1 with: - name: Clippy (1.53.0) + name: Clippy token: ${{ secrets.GITHUB_TOKEN }} args: --all-features --all-targets -- -D warnings diff --git a/bus-mapping/src/operation.rs b/bus-mapping/src/operation.rs index 73c0258495..cb72253f56 100644 --- a/bus-mapping/src/operation.rs +++ b/bus-mapping/src/operation.rs @@ -243,8 +243,8 @@ impl PartialOrd for StorageOp { impl Ord for StorageOp { fn cmp(&self, other: &StorageOp) -> Ordering { - match self.address().cmp(&other.address()) { - Ordering::Equal => self.key().cmp(&other.key()), + match self.address().cmp(other.address()) { + Ordering::Equal => self.key().cmp(other.key()), ord => ord, } } diff --git a/rust-toolchain b/rust-toolchain index a1e0dc9bdc..4a7a821502 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -stable-2021-06-17 +stable-2021-11-01