Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades Rust to 1.66.0 #29304

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/docker-rust-nightly/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM solanalabs/rust:1.65.0
FROM solanalabs/rust:1.66.0
ARG date

RUN set -x \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker-rust/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.65.0
FROM rust:1.66.0

# Add Google Protocol Buffers for Libra's metrics library.
ENV PROTOC_VERSION 3.8.0
Expand Down
2 changes: 1 addition & 1 deletion ci/rust-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fi
if [[ -n $RUST_NIGHTLY_VERSION ]]; then
nightly_version="$RUST_NIGHTLY_VERSION"
else
nightly_version=2022-11-02
nightly_version=2022-12-15
fi


Expand Down
4 changes: 1 addition & 3 deletions runtime/src/rent_collector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -357,9 +357,7 @@ mod tests {
let result = rent_collector.calculate_rent_result(&Pubkey::default(), &account, None);
assert!(
matches!(result, RentResult::Exempt),
"{:?}, set_exempt_rent_epoch_max: {}",
result,
set_exempt_rent_epoch_max,
"{result:?}, set_exempt_rent_epoch_max: {set_exempt_rent_epoch_max}",
);
{
let mut account_clone = account.clone();
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.65.0"
channel = "1.66.0"