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

Jump to bottom

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

merged 4 commits into from
Feb 17, 2023

Conversation

brooksprumo
Copy link
Contributor

@brooksprumo brooksprumo commented Jan 27, 2023 •
edited
Loading

@brooksprumo brooksprumo added work in progress This isn't quite right yet noCI Suppress CI on this Pull Request labels Jan 27, 2023
@brooksprumo brooksprumo self-assigned this Jan 27, 2023
@brooksprumo
Copy link
Contributor Author

@yihau I know we just did this dance for Rust 1.66.1 (and Rust 1.66.0)... but can you help me again by updating the CI machines to include the Rust 1.67.0 toolchain? 🙏🙏🙏

@mvines
Copy link
Member

mvines commented Jan 27, 2023

Please don't merge this until the 1.15 branch exists, as this [1] change to std::sync::mpsc could have a destabilizing effect on our threads upon threads codebase and if so it'd be preferable to deal with it in the 1.16 timeframe

[1] https://blog.rust-lang.org/2023/01/26/Rust-1.67.0.html#stdsyncmpsc-implementation-updated

@yihau
Copy link
Member

yihau commented Jan 27, 2023 •
edited
Loading

updated stable and nightly images 🪖

@brooksprumo brooksprumo force-pushed the rust-1.67.0 branch 2 times, most recently from 864fe02 to 956b6d7 Compare February 1, 2023 02:04
@brooksprumo brooksprumo added CI Pull Request is ready to enter CI and removed work in progress This isn't quite right yet noCI Suppress CI on this Pull Request labels Feb 1, 2023
@solana-grimes solana-grimes removed the CI Pull Request is ready to enter CI label Feb 1, 2023
@brooksprumo
Copy link
Contributor Author

brooksprumo commented Feb 1, 2023 •
edited
Loading

updated stable and nightly images 🪖

@yihau Could the nightly images be reverted? We cannot update nightly until #29852 is fixed. Thank you!

@yihau
Copy link
Member

yihau commented Feb 1, 2023

sure! I will revert it back!

@github-actions github-actions bot added the stale [bot only] Added to stale content; results in auto-close after a week. label Feb 16, 2023
@brooksprumo brooksprumo changed the title Upgrades Rust to 1.67.0 Upgrades Rust to 1.67.1 Feb 16, 2023
@brooksprumo brooksprumo mentioned this pull request Feb 16, 2023
Merged
@yihau
Copy link
Member

yihau commented Feb 16, 2023

sure thing. just updated them and re-run your pipeline 👻

@brooksprumo brooksprumo mentioned this pull request Feb 16, 2023
Merged
@brooksprumo brooksprumo removed the stale [bot only] Added to stale content; results in auto-close after a week. label Feb 16, 2023
brooksprumo
brooksprumo commented Feb 16, 2023
View reviewed changes
runtime/src/accounts_db.rs
Comment on lines +12366 to +12368
Hash::from_str("6qtBXmRrLdTdAV5bK6bZZJxQA4fPSUBxzQGq2BQSat25").unwrap()
} else {
Hash::from_str("33ruy7m3Xto7irYfsBSN74aAzQwCQxsfoZxXuZy2Rra3").unwrap()
Hash::from_str("5HL9MtsQmxZQ8XSgcAhSkqnrayQFXUY8FT1JsHjDNKbi").unwrap()
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.

@brooksprumo brooksprumo marked this pull request as ready for review February 17, 2023 12:10
@brooksprumo brooksprumo requested a review from mvines February 17, 2023 12:11
@brooksprumo
Copy link
Contributor Author

Please don't merge this until the 1.15 branch exists [...]

@mvines Tagged you to review. Is this change ok to merge now that the 1.15 branch exists?

brooksprumo
brooksprumo commented Feb 17, 2023
View reviewed changes
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
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.

mvines
mvines approved these changes Feb 17, 2023
View reviewed changes
Copy link
Member

@mvines mvines left a comment

Choose a reason for hiding this comment

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

Yep! Thanks

@brooksprumo brooksprumo merged commit f91e63d into solana-labs:master Feb 17, 2023
@brooksprumo brooksprumo deleted the rust-1.67.0 branch February 17, 2023 19:08
nickfrosty pushed a commit to nickfrosty/solana that referenced this pull request Mar 12, 2023
@brooksprumo @nickfrosty
Upgrades Rust to 1.67.1 (solana-labs#29947)
fdd93b9
This was referenced Aug 31, 2023
Closed
Merged
@ryoqun ryoqun changed the title Upgrades Rust to 1.67.1 Upgrades Rust from 1.66.1 to 1.67.1 Aug 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mvines mvines mvines approved these changes

Assignees

@brooksprumo brooksprumo

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@brooksprumo @mvines @yihau @solana-grimes