Update to nightly rustc to 2023-04-19 #31381

ryoqun · 2023-04-28T01:32:26Z

Problem

I'm impatient. ;)

and our nightly is too old

Summary of changes

Update nightly.

yihau · 2023-04-28T04:21:43Z

just updated docker images and retried the pipeline! let's see how it goes 👻

yihau · 2023-04-28T04:30:15Z

good and bad news. failed but is lint stuff 🤞

codecov · 2023-04-30T06:43:42Z

Codecov Report

Merging #31381 (f50e37d) into master (f985f73) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@            Coverage Diff            @@
##           master   #31381     +/-   ##
=========================================
  Coverage    81.2%    81.2%             
=========================================
  Files         733      733             
  Lines      204948   206460   +1512     
=========================================
+ Hits       166584   167850   +1266     
- Misses      38364    38610    +246

scripts/coverage.sh

gossip/src/cluster_info.rs

core/src/serve_repair.rs

brooksprumo · 2023-05-04T16:29:04Z

ci/rust-version.sh

@@ -29,7 +29,7 @@ fi
 if [[ -n $RUST_NIGHTLY_VERSION ]]; then
  nightly_version="$RUST_NIGHTLY_VERSION"
 else
-  nightly_version=2023-01-22
+  nightly_version=2023-04-19


Now's our chance!

Suggested change

nightly_version=2023-04-19

nightly_version=2023-04-20

hm? why bumping the nightly version is needed?

For maximum memes :)

(but no, not needed)

ryoqun · 2023-05-06T12:39:08Z

programs/bpf_loader/src/serialization.rs

@@ -994,58 +995,94 @@ mod tests {
    }

    // the old bpf_loader in-program deserializer bpf_loader::id()
-    #[allow(clippy::type_complexity)]
+    #[deny(unsafe_op_in_unsafe_fn)]


personally, i want this to be enabled at tree-wide. but this is different story.

ryoqun · 2023-05-06T12:49:35Z

programs/bpf_loader/src/serialization.rs

+            // rustc inserts debug_assert! for misaligned pointer dereferences when
+            // deserializing, starting from [1]. so, use std::mem::transmute as the last resort
+            // while preventing clippy from complaining to suggest not to use it.
+            // [1]: https://github.com/rust-lang/rust/commit/22a7a19f9333bc1fcba97ce444a3515cb5fb33e6
+            // as for the ub nature of the misaligned pointer dereference, this is
+            // acceptable in this code, given that this is cfg(test) and it's cared only with
+            // x86-64 and the target only incurs some performance penalty, not like segfaults
+            // in other targets.


@dmakarov this is fyi. I think you'll need to update the original code at sdk/program/entrypoint{,_deprecated}.rs when updating platform-tool to be based on rust toolchain 1.70+.

I already chatted with @Lichtso and @alessandrod. hope this comment does make sense for the uninformed. :)

brooksprumo · 2023-05-06T13:17:14Z

ci/test-checks.sh

@@ -75,7 +75,7 @@ fi

 _ ci/order-crates-for-publishing.py

-nightly_clippy_allows=()
+nightly_clippy_allows=(--allow=clippy::redundant_clone --allow clippy::match-result-ok)


Can these not be fixed first? Are there a lot? Can cargo clippy --fix resolve them automatically?

to be honest, i haven't looked into it at all and i'm just too tired at this moment. ;)

(rant time: this rust bump was simply cursed: sscache upstream debug and fix (thanks for the hard work by @yihau), grcov racing-condition bug (which turned out false-positive), the new misaligned debug_assert (see below diff), odd sigill in coverage update (ref: #31099); i just wanted Arc::into_inner(), which was merged a day after the nightly before #31487...)

Ah bummer, sorry about all that :(

Looks like this may be a clippy bug: rust-lang/rust-clippy#10577. One reporter indicated that the issue appeared between 3/16 and 3/18; I tried 3/17 and it has the bug. I tired 3/16 and the compiler crashed (maybe some other bug). I tried 3/15, and it has a clippy bug too (same one)? 3/13 seems to also have the bug...

That's as far as I've made it so far. In the meantime, I've put up #31525 and #31526 to fixup some clippy lints.

the checks step just passed with ef8bb88. :)

ryoqun · 2023-05-09T00:42:59Z

programs/bpf_loader/src/serialization.rs

@Lichtso could you review changes in this file? i think it's the only review-worth diff in this pr to merge. :)

CriesofCarrots · 2023-05-17T04:32:32Z

ci/test-checks.sh

@@ -75,7 +75,7 @@ fi

 _ ci/order-crates-for-publishing.py

-nightly_clippy_allows=()
+nightly_clippy_allows=(--allow=clippy::redundant_clone)


Why did you add this @ryoqun ?

@CriesofCarrots in short, I was exhausted for bumping nightly this time, which took months. (details: #31381 (comment))

just saw #31690. sorry for trouble because of inter-branch clippy inconsistency. to be honest, i didn't anticipated
this.

after initial triage from @brooksprumo, i sensed fixing this isn't straigtforward: #31381 (comment)

so, i opted to merge this pr in as-is. (this urgency is coming from the fact my upcoming pr will be blocked on rustc 1.70+)

seems @apfitzge is starting to tackle on this: #31685.

initially, i thought this exception isn't end of world thing, but seems to cause actual annoyance. I'll work on this.

Why did you add this @ryoqun ?

so, put differently, crude way to solicit collaboration. ;)

ryoqun requested a review from yihau April 28, 2023 01:32

ryoqun marked this pull request as draft April 28, 2023 14:02

ryoqun changed the title ~~Update to nightly rustc to 2023-04-19~~ wip: Update to nightly rustc to 2023-04-19 Apr 28, 2023

ryoqun force-pushed the nightly-rust-2023-04-19 branch from 54440a2 to 28a1487 Compare May 2, 2023 04:16

ryoqun commented May 2, 2023

View reviewed changes

scripts/coverage.sh Outdated Show resolved Hide resolved

ryoqun force-pushed the nightly-rust-2023-04-19 branch 2 times, most recently from 8b06485 to 6a1044a Compare May 4, 2023 05:05

ryoqun commented May 4, 2023

View reviewed changes

gossip/src/cluster_info.rs Outdated Show resolved Hide resolved

ryoqun commented May 4, 2023

View reviewed changes

core/src/serve_repair.rs Outdated Show resolved Hide resolved

ryoqun force-pushed the nightly-rust-2023-04-19 branch from 6a1044a to 54b9ed1 Compare May 4, 2023 12:55

yihau mentioned this pull request May 4, 2023

Upgrades nightly Rust to 2023-03-04 #31487

Merged

brooksprumo reviewed May 4, 2023

View reviewed changes

ryoqun force-pushed the nightly-rust-2023-04-19 branch from 4106add to 0add968 Compare May 5, 2023 12:34

ryoqun commented May 6, 2023

View reviewed changes

ryoqun changed the title ~~wip: Update to nightly rustc to 2023-04-19~~ Update to nightly rustc to 2023-04-19 May 6, 2023

ryoqun requested review from alessandrod and Lichtso May 6, 2023 12:50

ryoqun marked this pull request as ready for review May 6, 2023 12:50

ryoqun force-pushed the nightly-rust-2023-04-19 branch from e3f9571 to d0080e2 Compare May 6, 2023 12:51

ryoqun requested a review from brooksprumo May 6, 2023 12:51

brooksprumo reviewed May 6, 2023

View reviewed changes

ryoqun force-pushed the nightly-rust-2023-04-19 branch from 93a0ec7 to 9278184 Compare May 6, 2023 13:40

This was referenced May 6, 2023

clippy: Removes redundant async blocks #31526

Merged

clippy: Replace if let Some() = res.ok() with if let Ok() = res #31525

Merged

ryoqun force-pushed the nightly-rust-2023-04-19 branch from 9278184 to e62229a Compare May 8, 2023 12:45

ryoqun commented May 9, 2023

View reviewed changes

ryoqun force-pushed the nightly-rust-2023-04-19 branch from e62229a to ef8bb88 Compare May 9, 2023 05:06

ryoqun added 12 commits May 11, 2023 11:50

Update to nightly rustc to 2023-04-19

7af174a

pray...

e5619e3

Not enough pray..

3532ba5

skip check...

e747379

hope merciful shellcheck

0fc071e

ci hack...

dd39d44

Restore ci/test-checks.sh

3c02a48

Restore debug_assertions with proper workaround...

9b8434c

small cleanup

40a27b4

seems this isn't needed?

d73d3ec

Make the workaround more robust...

6a5b875

Remove now-resolved clippy exception

f50e37d

ryoqun force-pushed the nightly-rust-2023-04-19 branch from ef8bb88 to f50e37d Compare May 11, 2023 02:50

Lichtso approved these changes May 11, 2023

View reviewed changes

ryoqun merged commit 4d4dddc into solana-labs:master May 11, 2023

apfitzge mentioned this pull request May 16, 2023

Remove redundant clones #31685

Merged

CriesofCarrots reviewed May 17, 2023

View reviewed changes

CriesofCarrots mentioned this pull request May 17, 2023

Remove redundant clone #31690

Merged

ryoqun mentioned this pull request May 17, 2023

Temporarily use stable clippy for redundant_clone #31692

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to nightly rustc to 2023-04-19 #31381

Update to nightly rustc to 2023-04-19 #31381

ryoqun commented Apr 28, 2023 •

edited

Loading

yihau commented Apr 28, 2023

yihau commented Apr 28, 2023 •

edited

Loading

codecov bot commented Apr 30, 2023 •

edited

Loading

brooksprumo May 4, 2023

ryoqun May 6, 2023

brooksprumo May 6, 2023

ryoqun May 6, 2023

ryoqun May 6, 2023

brooksprumo May 6, 2023

ryoqun May 6, 2023

brooksprumo May 6, 2023

ryoqun May 9, 2023

ryoqun May 9, 2023

CriesofCarrots May 17, 2023

ryoqun May 17, 2023 •

edited

Loading

Update to nightly rustc to 2023-04-19 #31381

Update to nightly rustc to 2023-04-19 #31381

Conversation

ryoqun commented Apr 28, 2023 • edited Loading

Problem

Summary of changes

yihau commented Apr 28, 2023

yihau commented Apr 28, 2023 • edited Loading

codecov bot commented Apr 30, 2023 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryoqun May 17, 2023 • edited Loading

Choose a reason for hiding this comment

ryoqun commented Apr 28, 2023 •

edited

Loading

yihau commented Apr 28, 2023 •

edited

Loading

codecov bot commented Apr 30, 2023 •

edited

Loading

ryoqun May 17, 2023 •

edited

Loading