Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Upgrades nightly Rust to 2023-03-04 #31487

Merged
merged 2 commits into from
May 5, 2023

Conversation

brooksprumo
Copy link
Contributor

@brooksprumo brooksprumo commented May 4, 2023

Problem

The repo's nightly Rust version is old. In fact, it's older than the repo's stable Rust version 😬. Since we run clippy with nightly, we should strive to keep the nightly version current.

Summary of Changes

Upgrade nightly Rust to 2023-03-04, which is the latest nightly on version 1.69.0. Since this is the same version as our stable, we shouldn't run into any Rust-related issues 🤞

@brooksprumo brooksprumo self-assigned this May 4, 2023
@brooksprumo
Copy link
Contributor Author

@yihau Can I get your help here to update the CI images?

@yihau
Copy link
Contributor

yihau commented May 4, 2023

sure! one sec!
btw, @ryoqun is working on this one #31381 😈

@yihau
Copy link
Contributor

yihau commented May 4, 2023

just retried the pipeline and it failed due to some lint issues 😢
Screenshot 2023-05-05 at 12 43 25 AM

@brooksprumo
Copy link
Contributor Author

just retried the pipeline and it failed due to some lint issues 😢

Thanks! I'll fix these.

@@ -226,7 +226,7 @@ pub(crate) type Ping = ping_pong::Ping<[u8; REPAIR_PING_TOKEN_SIZE]>;

/// Window protocol messages
#[derive(Debug, AbiEnumVisitor, AbiExample, Deserialize, Serialize)]
#[frozen_abi(digest = "3bgE3sYHRqetvpo4fcDL6PTV3z2LMAtY6H8BoLFSjCwf")]
#[frozen_abi(digest = "6VyBwHjkAMXAN97fdhQgFv6VdPEnfJo9LdUAd2SFtwF3")]
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 moved some types from std to core in this PR: rust-lang/rust#104265, which causes the frozen abi code to see a bunch of diffs like this:

- field gossip: std::net::socket_addr::SocketAddr
+ field gossip: core::net::socket_addr::SocketAddr

This is safe, but does require updating the digest here.

For more info refer to Ryo's full writeup here: https://github.com/solana-labs/solana/pull/31381/files#r1184956432

@@ -273,7 +273,7 @@ pub fn make_accounts_hashes_message(
pub(crate) type Ping = ping_pong::Ping<[u8; GOSSIP_PING_TOKEN_SIZE]>;

// TODO These messages should go through the gpu pipeline for spam filtering
#[frozen_abi(digest = "FsZnSeTYNH7F51AxTaKUixXxjT6if2ThmPN1mhDWtXZM")]
#[frozen_abi(digest = "Ctxue3UVFXXqnHoMVAPmfBoCy3Cyg7gNCYBY7Cg9P3so")]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@codecov
Copy link

codecov bot commented May 4, 2023

Codecov Report

Merging #31487 (6c0a954) into master (886aea2) will decrease coverage by 0.1%.
The diff coverage is 100.0%.

@@            Coverage Diff            @@
##           master   #31487     +/-   ##
=========================================
- Coverage    81.4%    81.4%   -0.1%     
=========================================
  Files         731      731             
  Lines      208718   205067   -3651     
=========================================
- Hits       170017   166930   -3087     
+ Misses      38701    38137    -564     

@brooksprumo brooksprumo marked this pull request as ready for review May 4, 2023 20:38
@brooksprumo brooksprumo requested review from ryoqun and ilya-bobyr May 4, 2023 20:39
@brooksprumo
Copy link
Contributor Author

@ryoqun Hopefully this PR to get the nightly version equivalent to the stable version will make your PR a bit simpler!

Copy link
Contributor

@ryoqun ryoqun left a comment

Choose a reason for hiding this comment

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

lgtm; thanks for reducing my work load... :)

@brooksprumo brooksprumo merged commit c5e071c into solana-labs:master May 5, 2023
@brooksprumo brooksprumo deleted the rust-nightly branch May 5, 2023 12:28
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants