Upgrade to Rust 1.64.0 (#28034)

This commit is contained in:
Brooks Prumo 2022-09-29 09:32:24 -04:00 committed by GitHub
parent f3fda4652b
commit 12df0f234d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 6 deletions

View File

@ -525,6 +525,7 @@ mod tests {
} }
#[test] #[test]
#[allow(clippy::result_large_err)]
fn test_banks_server_transfer_via_server() -> Result<(), BanksClientError> { fn test_banks_server_transfer_via_server() -> Result<(), BanksClientError> {
// This test shows the preferred way to interact with BanksServer. // This test shows the preferred way to interact with BanksServer.
// It creates a runtime explicitly (no globals via tokio macros) and calls // It creates a runtime explicitly (no globals via tokio macros) and calls
@ -563,6 +564,7 @@ mod tests {
} }
#[test] #[test]
#[allow(clippy::result_large_err)]
fn test_banks_server_transfer_via_client() -> Result<(), BanksClientError> { fn test_banks_server_transfer_via_client() -> Result<(), BanksClientError> {
// The caller may not want to hold the connection open until the transaction // The caller may not want to hold the connection open until the transaction
// is processed (or blockhash expires). In this test, we verify the // is processed (or blockhash expires). In this test, we verify the

View File

@ -1,4 +1,4 @@
FROM solanalabs/rust:1.63.0 FROM solanalabs/rust:1.64.0
ARG date ARG date
RUN set -x \ RUN set -x \

View File

@ -1,6 +1,6 @@
# Note: when the rust version is changed also modify # Note: when the rust version is changed also modify
# ci/rust-version.sh to pick up the new image tag # 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. # Add Google Protocol Buffers for Libra's metrics library.
ENV PROTOC_VERSION 3.8.0 ENV PROTOC_VERSION 3.8.0

View File

@ -18,13 +18,13 @@
if [[ -n $RUST_STABLE_VERSION ]]; then if [[ -n $RUST_STABLE_VERSION ]]; then
stable_version="$RUST_STABLE_VERSION" stable_version="$RUST_STABLE_VERSION"
else else
stable_version=1.63.0 stable_version=1.64.0
fi fi
if [[ -n $RUST_NIGHTLY_VERSION ]]; then if [[ -n $RUST_NIGHTLY_VERSION ]]; then
nightly_version="$RUST_NIGHTLY_VERSION" nightly_version="$RUST_NIGHTLY_VERSION"
else else
nightly_version=2022-08-12 nightly_version=2022-09-22
fi fi

View File

@ -266,7 +266,7 @@ pub fn make_accounts_hashes_message(
pub(crate) type Ping = ping_pong::Ping<[u8; GOSSIP_PING_TOKEN_SIZE]>; pub(crate) type Ping = ping_pong::Ping<[u8; GOSSIP_PING_TOKEN_SIZE]>;
// TODO These messages should go through the gpu pipeline for spam filtering // 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)] #[derive(Serialize, Deserialize, Debug, AbiEnumVisitor, AbiExample)]
#[allow(clippy::large_enum_variant)] #[allow(clippy::large_enum_variant)]
pub(crate) enum Protocol { pub(crate) enum Protocol {

View File

@ -27,7 +27,7 @@ fn is_rosetta_emulated() -> bool {
{ {
use std::str::FromStr; use std::str::FromStr;
std::process::Command::new("sysctl") std::process::Command::new("sysctl")
.args(&["-in", "sysctl.proc_translated"]) .args(["-in", "sysctl.proc_translated"])
.output() .output()
.map_err(|_| ()) .map_err(|_| ())
.and_then(|output| String::from_utf8(output.stdout).map_err(|_| ())) .and_then(|output| String::from_utf8(output.stdout).map_err(|_| ()))