-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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
Update to nightly rustc to 2023-04-19 #31381
Conversation
just updated docker images and retried the pipeline! let's see how it goes 👻 |
Codecov Report
@@ Coverage Diff @@
## master #31381 +/- ##
=========================================
Coverage 81.2% 81.2%
=========================================
Files 733 733
Lines 204948 206460 +1512
=========================================
+ Hits 166584 167850 +1266
- Misses 38364 38610 +246 |
54440a2
to
28a1487
Compare
8b06485
to
6a1044a
Compare
6a1044a
to
54b9ed1
Compare
@@ -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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now's our chance!
nightly_version=2023-04-19 | |
nightly_version=2023-04-20 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hm? why bumping the nightly version is needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For maximum memes :)
(but no, not needed)
4106add
to
0add968
Compare
@@ -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)] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
personally, i want this to be enabled at tree-wide. but this is different story.
// 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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@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. :)
e3f9571
to
d0080e2
Compare
ci/test-checks.sh
Outdated
@@ -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) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can these not be fixed first? Are there a lot? Can cargo clippy --fix
resolve them automatically?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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...)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the checks
step just passed with ef8bb88. :)
93a0ec7
to
9278184
Compare
9278184
to
e62229a
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Lichtso could you review changes in this file? i think it's the only review-worth diff in this pr to merge. :)
e62229a
to
ef8bb88
Compare
ef8bb88
to
f50e37d
Compare
@@ -75,7 +75,7 @@ fi | |||
|
|||
_ ci/order-crates-for-publishing.py | |||
|
|||
nightly_clippy_allows=() | |||
nightly_clippy_allows=(--allow=clippy::redundant_clone) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did you add this @ryoqun ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@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. ;)
Problem
I'm impatient. ;)
and our nightly is too old
Summary of changes
Update nightly.