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.

Sign up for GitHub

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 from 1.66.1 to 1.67.1 #29947

Merged
merged 4 commits into from
Feb 17, 2023
Merged

Upgrades Rust from 1.66.1 to 1.67.1 #29947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad71241
Upgrades Rust to 1.67.0
brooksprumo Jan 27, 2023
c1f761f
Upgrades Rust to 1.67.1
brooksprumo Feb 16, 2023
94035a7
Upgrades rust nightly to 2023-01-22
brooksprumo Feb 16, 2023
0c2e640
update test hashes since StoredAccountMeta layout changed
brooksprumo Feb 16, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM solanalabs/rust:1.66.1
FROM solanalabs/rust:1.67.1
ARG date

RUN set -x \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker-rust/Dockerfile
View file
Open in desktop
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.66.1
FROM rust:1.67.1

RUN set -x \
&& apt update \
Expand Down
2 changes: 1 addition & 1 deletion ci/rust-version.sh
View file
Open in desktop
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=2023-01-22
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the last nightly 1.68 version. I initially wanted to bump this all the way to today, but there were other new clippy lints in 1.69 that were getting thrown within our dependencies. I figured it was more important to get the nightly version upgraded to something than to block this PR further.

fi


Expand Down
4 changes: 2 additions & 2 deletions runtime/src/accounts_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Comment on lines +12366 to +12368
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rust changed how it layout structs in memory, which affects StoredAccountMeta and thus these digests.

};

assert_eq!(
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.66.1"
channel = "1.67.1"