From f91e63dfe9527199acb692a43629a97f0bf78e1f Mon Sep 17 00:00:00 2001 From: Brooks Date: Fri, 17 Feb 2023 14:08:27 -0500 Subject: [PATCH] Upgrades Rust to 1.67.1 (#29947) --- ci/docker-rust-nightly/Dockerfile | 2 +- ci/docker-rust/Dockerfile | 2 +- ci/rust-version.sh | 2 +- runtime/src/accounts_db.rs | 4 ++-- rust-toolchain.toml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/docker-rust-nightly/Dockerfile b/ci/docker-rust-nightly/Dockerfile index 1a9a2d8ee..b53020d46 100644 --- a/ci/docker-rust-nightly/Dockerfile +++ b/ci/docker-rust-nightly/Dockerfile @@ -1,4 +1,4 @@ -FROM solanalabs/rust:1.66.1 +FROM solanalabs/rust:1.67.1 ARG date RUN set -x \ diff --git a/ci/docker-rust/Dockerfile b/ci/docker-rust/Dockerfile index ec1aac714..e9e4e7255 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.66.1 +FROM rust:1.67.1 RUN set -x \ && apt update \ diff --git a/ci/rust-version.sh b/ci/rust-version.sh index 1f2bfb98f..501d2a2bd 100644 --- a/ci/rust-version.sh +++ b/ci/rust-version.sh @@ -29,7 +29,7 @@ fi if [[ -n $RUST_NIGHTLY_VERSION ]]; then nightly_version="$RUST_NIGHTLY_VERSION" else - nightly_version=2022-11-02 + nightly_version=2023-01-22 fi diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs index c8c671caf..b3984f3e6 100644 --- a/runtime/src/accounts_db.rs +++ b/runtime/src/accounts_db.rs @@ -12363,9 +12363,9 @@ pub mod tests { let account = stored_account.clone_account(); let expected_account_hash = if cfg!(debug_assertions) { - Hash::from_str("4StuvYHFd7xuShVXB94uHHvpqGMCaacdZnYB74QQkPA1").unwrap() + Hash::from_str("6qtBXmRrLdTdAV5bK6bZZJxQA4fPSUBxzQGq2BQSat25").unwrap() } else { - Hash::from_str("33ruy7m3Xto7irYfsBSN74aAzQwCQxsfoZxXuZy2Rra3").unwrap() + Hash::from_str("5HL9MtsQmxZQ8XSgcAhSkqnrayQFXUY8FT1JsHjDNKbi").unwrap() }; assert_eq!( diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f701aa535..588ffd578 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.66.1" +channel = "1.67.1"