bump rust to 1.80.1 / 2024-08-08 #2487

yihau · 2024-08-08T13:12:33Z

Summary of Changes

bump rust stable to 1.80.1 from 1.78.0
bump rust nightly to 2024-08-08 from 2024-05-02
cherry-pick clippy: allow macro_metavars_in_unsafe #2488
cherry-pick fix unexpected tag #2499 + add no-entrypoint to the workspace-level lint config.
run anchor test with their master branch

yihau · 2024-08-09T07:54:36Z

they released a new patch. will use it

https://blog.rust-lang.org/2024/08/08/Rust-1.80.1.html

yihau · 2024-08-13T17:11:32Z

looking at the latest 3 anchor releases (0.29.0, 0.30.0, 0.30.1), they all depend on time v0.3.29, and Rust 1.80.1 is not happy with this version:

not sure if it's a good idea to just run anchor test with their master branch: 86848e3

cc @joncinque

.github/workflows/downstream-project-anchor.yml

metrics/src/counter.rs

joncinque · 2024-08-13T17:50:53Z

@yihau I think it's reasonable to use master until a release is tagged with the fix. We might be able to follow along at coral-xyz/anchor#3143

yihau · 2024-08-13T18:03:02Z

thank you for the confirmation @joncinque 🫶 I just submitted an issue as a reminder: #2577

brooksprumo

👻

ryoqun · 2024-08-14T00:49:15Z

could be done by a follow up pr but seems coverage build is broken...

https://buildkite.com/anza/agave/builds/9332#01914c6e-206a-46bc-bcd5-bd45f56c72e2/6-12191:

warning: /tmp/.tmpAk7rfX/profraw/default-82429-4038632013895607840_0_1.profraw: raw profile version mismatch: Profile uses raw profile format version = 10; expected version = 9
PLEASE update this tool to version in the raw profile, or regenerate raw profile with expected version.
warning: /tmp/.tmpAk7rfX/profraw/default-122440-2816328413332674788_0_1.profraw: raw profile version mismatch: Profile uses raw profile format version = 10; expected version = 9
PLEASE update this tool to version in the raw profile, or regenerate raw profile with expected version.
warning: /tmp/.tmpAk7rfX/profraw/default-152543-1154487265959453352_0_1.profraw: raw profile version mismatch: Profile uses raw profile format version = 10; expected version = 9
PLEASE update this tool to version in the raw profile, or regenerate raw profile with expected version.
error: no profile can be merged
17:10:53 [ERROR] Error while executing llvm tools: Failure while running "/usr/local/rustup/toolchains/1.80.1-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata" "merge" "-f" "-" "-sparse" "-o" "/tmp/.tmpAk7rfX/0/grcov.profdata"
lcov: /solana/scripts/../target/cov/39418df52/coverage/lcov.info
tar: Removing leading `/solana/ci/../' from member names
artifact: /solana/ci/../target/cov/39418df52/coverage.tar

i think we need make sure to use llvm-profdata from nightly's llvm-tools-preview.

yihau · 2024-08-14T10:07:55Z

let me check the coverage issue 🤔

brooksprumo · 2024-08-14T11:24:08Z

ci/docker/Dockerfile

-FROM ubuntu:20.04
+FROM ubuntu:22.04


This is a pretty big change. I think these should be in their own separate PR.

oh, actually, it will only affect the tests that use Rust 1.80.1. This means v2.0 and v1.18 won’t be affected by these changes (and old master commits that are using Rust 1.79.0). do you still have concerns if the situation is as I described? to me, it's a really good chance to upgrade those things when we introduce a new rust version haha. just like a new start!

btw, I’m still struggling with the coverage tests 😢 I will keep posting here

IMO if we can make the ubuntu upgrade separately from this PR, we should. Then we keep this PR just about the rust version bump.

okay! let me try! I think I figured out the coverage issue. need to rebuild the image. will push commits and ping you!

Good callout Brooks - I'm in favor of bumping the Ubuntu version, but agree that it should be external to this PR

@yihau hmm, maybe i should have been more explicit at my suggestion of this: #2487 (comment)

i think we should use vendorized llvm from the rust-lang, instead of installing the official llvm manually.. this is easier and natually is sync with rust nightly more. in that way, bumping ubuntu (is good thing!) can be separated from this pr.

recent nightly's coverage data is incompatible with llvm 18. it only works now with llvm 19. currently coverage is run under nightly (ie using llvm 19), yet using llvm-profdata from stable rustup toolchain (which is still using llvm 18).

$ rustup component add --toolchain 1.80.1-x86_64-unknown-linux-gnu llvm-tools-preview info: downloading component 'llvm-tools' info: installing component 'llvm-tools' 31.2 MiB / 31.2 MiB (100 %) 14.8 MiB/s in 2s ETA: 0s $ rustup component add --toolchain nightly-2024-08-08-x86_64-unknown-linux-gnu llvm-tools-preview info: downloading component 'llvm-tools' info: installing component 'llvm-tools' 32.7 MiB / 32.7 MiB (100 %) 14.7 MiB/s in 2s ETA: 0s $ /home/ryoqun/.rustup/toolchains/1.80.1-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata --version LLVM (http://llvm.org/): LLVM version 18.1.7-rust-1.80.1-stable Optimized build. $ /home/ryoqun/.rustup/toolchains/nightly-2024-08-08-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata --version LLVM (http://llvm.org/): LLVM version 19.1.0-rust-1.82.0-nightly Optimized build.

After that, I think we need to just meddle with PATH only running the grcov.

(nevertheless, thanks for working on bumping rust. as i like to use latest and greatest rust things (yet not enough time...), i'd like to appreciate your efforts very much.)

yihau · 2024-08-15T05:49:43Z

sorry for the late. I pushed a new commit for fixing coverage test and rebased master for solving conflict. looks all good! it's ready for another review! 🫡

ryoqun · 2024-08-15T13:05:27Z

define-syscall/Cargo.toml

+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = [
+  'cfg(target_feature, values("static-syscalls"))',
+] }


ryoqun · 2024-08-15T13:05:40Z

Cargo.toml

+[workspace.lints.rust.unexpected_cfgs]
+level = "warn"
+check-cfg = [
+    'cfg(target_os, values("solana"))',
+    'cfg(feature, values("frozen-abi", "no-entrypoint"))',
+    'cfg(RUSTC_WITH_SPECIALIZATION)',
+    'cfg(RUSTC_WITHOUT_SPECIALIZATION)',
+]
+


nit: this can be a follow up pr, but it seems it's prime time for us to finally move lints from scripts/cargo-clippy-nightly.sh

for that, i think this formatting is preferred:

[workspace.lints.rust] unexpected_cfgs = { level = "warn", check-cfg = [ ... ] }

like this: https://github.com/anza-xyz/agave/pull/2487/files#r1718380391

ryoqun · 2024-08-15T13:07:16Z

programs/sbf/Cargo.toml

@@ -7,6 +7,10 @@ homepage = "https://anza.xyz"
 license = "Apache-2.0"
 edition = "2021"

+[workspace.lints.rust.unexpected_cfgs]


nit: same as https://github.com/anza-xyz/agave/pull/2487/files#r1718380621

ryoqun · 2024-08-15T13:20:10Z

seems there's no notable abi-related changes in rust 1.79 and 1.80. that said,

this is a few of my select cool things from the rust change log:

also, this new panic source seems not to be affecting us:
Panic if PathBuf::set_extension would add a path separator

ryoqun · 2024-08-15T13:21:06Z

scripts/coverage.sh

+# Check llvm path
+llvm_profdata="$(find "$(rustc +"$rust_nightly" --print sysroot)" -name llvm-profdata)"
+if [ -z "$llvm_profdata" ]; then
+  echo "Error: couldn't find llvm-profdata. Try installing the llvm-tools component with \`rustup component add llvm-tools-preview --toolchain=$rust_nightly\`"
+  exit 1
+fi
+llvm_path="$(dirname "$llvm_profdata")"


ryoqun

lgtm with nits.

yihau · 2024-08-16T03:55:05Z

🪖

yihau changed the title ~~bump rust to 1.80.0 / 2024-07-21~~ bump rust to 1.80.1 / 2024-08-08 Aug 9, 2024

yihau force-pushed the bump-rust branch from b62de47 to 9e522ff Compare August 9, 2024 08:26

This was referenced Aug 11, 2024

clippy: manual_inspect #2541

Merged

fix docs format #2542

Merged

clippy: allow all clippy for mod google in storage-bigtable #2543

Merged

clippy: needless_maybe_sized #2545

Merged

fix: dependency_on_unit_never_type_fallback #2551

Merged

yihau force-pushed the bump-rust branch from 9e522ff to 245931f Compare August 13, 2024 03:52

yihau mentioned this pull request Aug 13, 2024

docs: fix coption doc test #2571

Merged

yihau force-pushed the bump-rust branch from 245931f to 39418df Compare August 13, 2024 15:49

yihau marked this pull request as ready for review August 13, 2024 17:11

yihau requested review from brooksprumo and steviez August 13, 2024 17:12

brooksprumo reviewed Aug 13, 2024

View reviewed changes

.github/workflows/downstream-project-anchor.yml Show resolved Hide resolved

metrics/src/counter.rs Show resolved Hide resolved

yihau mentioned this pull request Aug 13, 2024

ci: update anchor test target version #2577

Open

brooksprumo previously approved these changes Aug 13, 2024

View reviewed changes

yihau dismissed brooksprumo’s stale review via 4ed5155 August 14, 2024 08:23

yihau force-pushed the bump-rust branch from 4ed5155 to 72ab854 Compare August 14, 2024 11:10

brooksprumo reviewed Aug 14, 2024

View reviewed changes

yihau added 8 commits August 15, 2024 12:35

bump rust to 1.80

e24c93a

bump nightly version to 2024-07-21

4437ec8

bump rust stable to 1.80.1, nightly to 2024-08-08

833905a

clippy: macro_metavars_in_unsafe

5abdd56

fix unexpected tag

7bb3dc8

run anchor downstream test with their master

9a7f45d

add no-entrypoint into workspace level lint

351dfb9

use correct llvm path for coverage test

cc71b2a

yihau force-pushed the bump-rust branch from 72ab854 to cc71b2a Compare August 15, 2024 04:36

ryoqun reviewed Aug 15, 2024

View reviewed changes

ryoqun approved these changes Aug 15, 2024

View reviewed changes

yihau merged commit d8e95ac into anza-xyz:master Aug 16, 2024
53 checks passed

yihau deleted the bump-rust branch August 16, 2024 03:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bump rust to 1.80.1 / 2024-08-08 #2487

bump rust to 1.80.1 / 2024-08-08 #2487

yihau commented Aug 8, 2024 •

edited by ryoqun

Loading

yihau commented Aug 9, 2024 •

edited

Loading

yihau commented Aug 13, 2024

joncinque commented Aug 13, 2024

yihau commented Aug 13, 2024

brooksprumo left a comment

ryoqun commented Aug 14, 2024 •

edited

Loading

yihau commented Aug 14, 2024

brooksprumo Aug 14, 2024

yihau Aug 14, 2024

brooksprumo Aug 14, 2024

yihau Aug 14, 2024

steviez Aug 14, 2024

ryoqun Aug 15, 2024 •

edited

Loading

ryoqun Aug 15, 2024

yihau commented Aug 15, 2024 •

edited

Loading

ryoqun Aug 15, 2024

ryoqun Aug 15, 2024

ryoqun Aug 15, 2024

ryoqun commented Aug 15, 2024

ryoqun Aug 15, 2024

ryoqun left a comment

yihau commented Aug 16, 2024

		FROM ubuntu:20.04
		FROM ubuntu:22.04

bump rust to 1.80.1 / 2024-08-08 #2487

bump rust to 1.80.1 / 2024-08-08 #2487

Conversation

yihau commented Aug 8, 2024 • edited by ryoqun Loading

Summary of Changes

yihau commented Aug 9, 2024 • edited Loading

yihau commented Aug 13, 2024

joncinque commented Aug 13, 2024

yihau commented Aug 13, 2024

brooksprumo left a comment

Choose a reason for hiding this comment

ryoqun commented Aug 14, 2024 • edited Loading

yihau commented Aug 14, 2024

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 Aug 15, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yihau commented Aug 15, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryoqun commented Aug 15, 2024

Choose a reason for hiding this comment

ryoqun left a comment

Choose a reason for hiding this comment

yihau commented Aug 16, 2024

yihau commented Aug 8, 2024 •

edited by ryoqun

Loading

yihau commented Aug 9, 2024 •

edited

Loading

ryoqun commented Aug 14, 2024 •

edited

Loading

ryoqun Aug 15, 2024 •

edited

Loading

yihau commented Aug 15, 2024 •

edited

Loading