From 1cf2656a43433517e3a9c5863fbe0b209865f7fa Mon Sep 17 00:00:00 2001 From: hrls Date: Tue, 14 Sep 2021 16:37:35 +0300 Subject: [PATCH] chore: bump rust to 1.55, fix clippy warns --- ci/docker-rust-nightly/Dockerfile | 2 +- ci/docker-rust/Dockerfile | 2 +- ci/rust-version.sh | 2 +- evm-utils/programs/evm_loader/src/instructions.rs | 2 +- rust-toolchain | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/docker-rust-nightly/Dockerfile b/ci/docker-rust-nightly/Dockerfile index 4cf08b7cba..469ea91b6d 100644 --- a/ci/docker-rust-nightly/Dockerfile +++ b/ci/docker-rust-nightly/Dockerfile @@ -1,4 +1,4 @@ -FROM solanalabs/rust:1.51.0 +FROM solanalabs/rust:1.55.0 ARG date RUN set -x \ diff --git a/ci/docker-rust/Dockerfile b/ci/docker-rust/Dockerfile index bad2bd7150..a714bc03fb 100644 --- a/ci/docker-rust/Dockerfile +++ b/ci/docker-rust/Dockerfile @@ -1,6 +1,6 @@ # Note: when the rust version is changed also modify # ci/rust-version.sh to pick up the new image tag -FROM rust:1.51.0 +FROM rust:1.55.0 # Add Google Protocol Buffers for Libra's metrics library. ENV PROTOC_VERSION 3.8.0 diff --git a/ci/rust-version.sh b/ci/rust-version.sh index 75677bf763..de047d3479 100644 --- a/ci/rust-version.sh +++ b/ci/rust-version.sh @@ -18,7 +18,7 @@ if [[ -n $RUST_STABLE_VERSION ]]; then stable_version="$RUST_STABLE_VERSION" else - stable_version=1.53.0 + stable_version=1.55.0 fi if [[ -n $RUST_NIGHTLY_VERSION ]]; then diff --git a/evm-utils/programs/evm_loader/src/instructions.rs b/evm-utils/programs/evm_loader/src/instructions.rs index 4caefdca9c..c8e2ea3ea8 100644 --- a/evm-utils/programs/evm_loader/src/instructions.rs +++ b/evm-utils/programs/evm_loader/src/instructions.rs @@ -391,7 +391,7 @@ mod test { &big_tx_tag[..], &execute_tag[..], &h160_len[..], - &from_hex_bytes[..], + from_hex_bytes, ] .concat(); assert_eq!(data, result_data) diff --git a/rust-toolchain b/rust-toolchain index 1dd3c1bff9..b28b4ab7dc 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,4 +1,4 @@ [toolchain] -channel = "1.54.0" +channel = "1.55.0" profile = "minimal" components = ["clippy", "rustfmt"] \ No newline at end of file