diff --git a/banks-client/src/lib.rs b/banks-client/src/lib.rs index fd41dd4f8..cbe9943fa 100644 --- a/banks-client/src/lib.rs +++ b/banks-client/src/lib.rs @@ -525,6 +525,7 @@ mod tests { } #[test] + #[allow(clippy::result_large_err)] fn test_banks_server_transfer_via_server() -> Result<(), BanksClientError> { // This test shows the preferred way to interact with BanksServer. // It creates a runtime explicitly (no globals via tokio macros) and calls @@ -563,6 +564,7 @@ mod tests { } #[test] + #[allow(clippy::result_large_err)] fn test_banks_server_transfer_via_client() -> Result<(), BanksClientError> { // The caller may not want to hold the connection open until the transaction // is processed (or blockhash expires). In this test, we verify the diff --git a/ci/docker-rust-nightly/Dockerfile b/ci/docker-rust-nightly/Dockerfile index 12aeff7e5..b00610d23 100644 --- a/ci/docker-rust-nightly/Dockerfile +++ b/ci/docker-rust-nightly/Dockerfile @@ -1,4 +1,4 @@ -FROM solanalabs/rust:1.63.0 +FROM solanalabs/rust:1.64.0 ARG date RUN set -x \ diff --git a/ci/docker-rust/Dockerfile b/ci/docker-rust/Dockerfile index a256d308d..f1e4a8b15 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.63.0 +FROM rust:1.64.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 792863c32..3e99fce7e 100644 --- a/ci/rust-version.sh +++ b/ci/rust-version.sh @@ -18,13 +18,13 @@ if [[ -n $RUST_STABLE_VERSION ]]; then stable_version="$RUST_STABLE_VERSION" else - stable_version=1.63.0 + stable_version=1.64.0 fi if [[ -n $RUST_NIGHTLY_VERSION ]]; then nightly_version="$RUST_NIGHTLY_VERSION" else - nightly_version=2022-08-12 + nightly_version=2022-09-22 fi diff --git a/gossip/src/cluster_info.rs b/gossip/src/cluster_info.rs index 4118df7a5..81d83ec91 100644 --- a/gossip/src/cluster_info.rs +++ b/gossip/src/cluster_info.rs @@ -266,7 +266,7 @@ pub fn make_accounts_hashes_message( pub(crate) type Ping = ping_pong::Ping<[u8; GOSSIP_PING_TOKEN_SIZE]>; // TODO These messages should go through the gpu pipeline for spam filtering -#[frozen_abi(digest = "C1nR7B7CgMyUYo6h3z2KXcS38JSwF6y8jmZ6Y9Cz7XEd")] +#[frozen_abi(digest = "9YNaHHwzwQaAaXDXW5A8k47HDuUzRYNjTAdARoAgVvPU")] #[derive(Serialize, Deserialize, Debug, AbiEnumVisitor, AbiExample)] #[allow(clippy::large_enum_variant)] pub(crate) enum Protocol { diff --git a/perf/src/lib.rs b/perf/src/lib.rs index e875cf864..3aec26be0 100644 --- a/perf/src/lib.rs +++ b/perf/src/lib.rs @@ -27,7 +27,7 @@ fn is_rosetta_emulated() -> bool { { use std::str::FromStr; std::process::Command::new("sysctl") - .args(&["-in", "sysctl.proc_translated"]) + .args(["-in", "sysctl.proc_translated"]) .output() .map_err(|_| ()) .and_then(|output| String::from_utf8(output.stdout).map_err(|_| ()))