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.72.0 & nightly-2023-08-25 #32961

Merged
merged 8 commits into from
Sep 1, 2023
Merged

Upgrades Rust to 1.72.0 & nightly-2023-08-25 #32961

merged 8 commits into from
Sep 1, 2023

Conversation

Lichtso
Copy link
Contributor

@Lichtso Lichtso commented Aug 23, 2023

@brooksprumo
Copy link
Contributor

Rust 1.72.0 is schedule to be released tomorrow, any interest in waiting a day and going all the way to 1.72.0 instead?

I think I tired upgrading to 1.71.0 when it was first released; iirc there was a clippy bug that is supposed to be fixed in 1.72.0. Let me see if I can find more information.

@Lichtso Lichtso changed the title Upgrades Rust to 1.71.0 Upgrades Rust to 1.72.0 Aug 23, 2023
@Lichtso
Copy link
Contributor Author

Lichtso commented Aug 23, 2023

This will give us OnceCell which can mostly replace lazy_static.

@brooksprumo
Copy link
Contributor

I think I tired upgrading to 1.71.0 when it was first released; iirc there was a clippy bug that is supposed to be fixed in 1.72.0. Let me see if I can find more information.

Maybe the clippy bug I was thinking about was fixed in 1.71.0? Here's more context: https://discord.com/channels/428295358100013066/832013492239990805/1117251668141154424

@brooksprumo
Copy link
Contributor

By chance have you already tried checks locally with 1.72.0 from beta/nightly? I would imagine there are new clippy lints to deal with.

@brooksprumo
Copy link
Contributor

@yihau Flagging this PR for you. Tomorrow when Rust 1.72.0 is released, can the CI image be updated with this new version?

@Lichtso
Copy link
Contributor Author

Lichtso commented Aug 23, 2023

No have not tried 1.72.0, only 1.71.0
If it is too much work, we can revert this PR back to 1.71.0

@brooksprumo
Copy link
Contributor

No have not tried 1.72.0, only 1.71.0 If it is too much work, we can revert this PR back to 1.71.0

If we need to revert, can we use 1.71.1 instead of 1.71.0?
https://blog.rust-lang.org/2023/08/03/Rust-1.71.1.html

@brooksprumo
Copy link
Contributor

@yihau Ok, Rust 1.72.0 has been released!
https://blog.rust-lang.org/2023/08/24/Rust-1.72.0.html

@yihau
Copy link
Member

yihau commented Aug 24, 2023

yeah but it seems that they haven't uploaded the docker image. maybe need some time 😢

@Lichtso Lichtso force-pushed the rust/v1.71.0 branch 2 times, most recently from 1505fd9 to a40e03c Compare August 24, 2023 16:03
@apfitzge apfitzge self-requested a review August 24, 2023 16:28
Copy link
Contributor

@brooksprumo brooksprumo left a comment

Choose a reason for hiding this comment

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

Overall looks good.

For anyone wondering about the integer_arithmetic -> arithmetic_side_effects, it was renamed. See this page for more info: https://rust-lang.github.io/rust-clippy/master/index.html#/arithmetic_side_effects

sdk/src/transaction_context.rs Outdated Show resolved Hide resolved
@Lichtso
Copy link
Contributor Author

Lichtso commented Aug 24, 2023

I think we should split this into multiple PRs, just trying to gather what is required in total here.

@yihau
Copy link
Member

yihau commented Aug 25, 2023

just updated docker images 🐳 and re-run your pipeline. it seems to be blocked on this error atm
Screenshot 2023-08-25 at 12 30 55 PM

@ryoqun ryoqun changed the title Upgrades Rust to 1.72.0+nightly-2023-08-25 Upgrades Rust to 1.72.0 & nightly-2023-08-25 Aug 31, 2023
@ryoqun
Copy link
Member

ryoqun commented Aug 31, 2023

sadly, it's my sleep time! please merge or fix more if ci fails further after the currently running one...

Comment on lines 541 to 543
// rust 1.73+ (our as-of-writing nightly version) changed panic message. we're stuck with this
// short common substring until the monorepo is fully 1.73+ including stable.
#[should_panic(expected = "left == right")]
Copy link
Contributor

@brooksprumo brooksprumo Aug 31, 2023

Choose a reason for hiding this comment

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

FYI I'm fixing this here: #33091
Edit: Merged.

* remove dubious test
@t-nelson t-nelson added the CI Pull Request is ready to enter CI label Sep 1, 2023
@solana-grimes solana-grimes removed the CI Pull Request is ready to enter CI label Sep 1, 2023
@Lichtso Lichtso added the automerge Merge this Pull Request automatically once CI passes label Sep 1, 2023
@codecov
Copy link

codecov bot commented Sep 1, 2023

Codecov Report

Merging #32961 (310e6e8) into master (4fe0812) will increase coverage by 0.1%.
Report is 1 commits behind head on master.
The diff coverage is 95.5%.

@@            Coverage Diff            @@
##           master   #32961     +/-   ##
=========================================
+ Coverage    81.9%    82.1%   +0.1%     
=========================================
  Files         785      785             
  Lines      213430   211171   -2259     
=========================================
- Hits       174938   173385   -1553     
+ Misses      38492    37786    -706     

@mergify mergify bot merged commit 9e703f8 into master Sep 1, 2023
25 checks passed
@mergify mergify bot deleted the rust/v1.71.0 branch September 1, 2023 07:26
shr-project added a commit to shr-project/meta-webosose that referenced this pull request Jan 5, 2024
:Release Notes:
After rust upgrade in oe-core from 1.71.1 to 1.74.1 in:
https://git.openembedded.org/openembedded-core/commit/?id=30637cdeb31fae02544fdc643a455d0ebb126ee6
and following commits, solana was failing to build.

:Detailed Notes:
Backport a fix from v1.17.0:
solana-labs/solana#32961

we need only this part:
solana-labs/solana@9e703f8#diff-2830a98fa15197faaaf1226883e9011c9302fedb10c7926077b17c07fa320c57

for other fixes we should just upgrade solana in OSE to latest.

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRP-29491] Create GPVB with Yocto 5.0 Scarthgap

Change-Id: I4b926d3da35a3f2341593f19bb1332b233fc2c2a
shr-project added a commit to shr-project/meta-webosose that referenced this pull request Jan 17, 2024
:Release Notes:
After rust upgrade in oe-core from 1.71.1 to 1.74.1 in:
https://git.openembedded.org/openembedded-core/commit/?id=30637cdeb31fae02544fdc643a455d0ebb126ee6
and following commits, solana was failing to build.

:Detailed Notes:
Backport a fix from v1.17.0:
solana-labs/solana#32961

we need only this part:
solana-labs/solana@9e703f8#diff-2830a98fa15197faaaf1226883e9011c9302fedb10c7926077b17c07fa320c57

for other fixes we should just upgrade solana in OSE to latest.

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRP-29491] Create GPVB with Yocto 5.0 Scarthgap

Change-Id: I4b926d3da35a3f2341593f19bb1332b233fc2c2a
shr-project added a commit to shr-project/meta-webosose that referenced this pull request Jan 19, 2024
:Release Notes:
After rust upgrade in oe-core from 1.71.1 to 1.74.1 in:
https://git.openembedded.org/openembedded-core/commit/?id=30637cdeb31fae02544fdc643a455d0ebb126ee6
and following commits, solana was failing to build.

:Detailed Notes:
Backport a fix from v1.17.0:
solana-labs/solana#32961

we need only this part:
solana-labs/solana@9e703f8#diff-2830a98fa15197faaaf1226883e9011c9302fedb10c7926077b17c07fa320c57

for other fixes we should just upgrade solana in OSE to latest.

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRP-29491] Create GPVB with Yocto 5.0 Scarthgap

Change-Id: I4b926d3da35a3f2341593f19bb1332b233fc2c2a
ywbyun0815 pushed a commit to webosose/meta-webosose that referenced this pull request Jun 10, 2024
:Release Notes:
After rust upgrade in oe-core from 1.71.1 to 1.74.1 in:
https://git.openembedded.org/openembedded-core/commit/?id=30637cdeb31fae02544fdc643a455d0ebb126ee6
and following commits, solana was failing to build.

:Detailed Notes:
Backport a fix from v1.17.0:
solana-labs/solana#32961

we need only this part:
solana-labs/solana@9e703f8#diff-2830a98fa15197faaaf1226883e9011c9302fedb10c7926077b17c07fa320c57

for other fixes we should just upgrade solana in OSE to latest.

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRQ-9293] CCC: solana: Fix build with rust-1.72 and newer
[WRP-29491] Create GPVB with Yocto 5.0 Scarthgap

Cherry-picked-from-commit: 76222be
Cherry-picked-from-branch:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants