Bump MSRV to Rust 1.63.0 #102

tcharding · 2024-09-04T00:40:12Z

Rust 1.63.0 is in Debian stable, lets use it as our MSRV.

Includes:

move of msrv field in clippy.toml to rust-version field in Cargo.toml
required fuzz changes (toolchain, bump of hongfuzz version)
gets fields by grepping when generating the fuzz manifest
removes now unneeded pinning in CI script

And includes unrelated fix by adding unexpected_cfgs.

tcharding · 2024-09-04T00:46:47Z

Needs #103

tcharding · 2024-09-04T00:52:29Z

Woops, the date in the branch name is wrong, I did not do this PR in the future.

Kixunil

Concept ACK

tcharding · 2024-09-05T06:58:59Z

Bloody hell, will try to fix tomorrow.

tcharding · 2024-09-05T23:13:58Z

f**king generate-files.sh bit me again.

tcharding · 2024-09-05T23:26:56Z

This fucking PR is starting to piss me off.

tcharding · 2024-09-06T00:04:47Z

Compiler is version 1.58 even over in #106. Just kill me already :)

tcharding · 2024-09-06T01:05:11Z

Phew, finally found it, all I needed was a breather and a good feed. FTR it was buried in the fuzz/Cargo.toml output of generate-files.sh.

Kixunil · 2024-09-06T04:24:05Z

clippy.toml

@@ -1 +1 @@
-msrv = "1.56.1"
+msrv = "1.63.0"


This file should be no longer needed, clippy can read Cargo.toml

Cool, we can remove this all over the place if that is the case.

Kixunil · 2024-09-06T04:24:27Z

contrib/test.sh

@@ -3,7 +3,7 @@
 set -ex

 FEATURES="std alloc serde"
-MSRV="1\.48\.0"
+MSRV="1\.63\.0"


SSOT break. This should just read Cargo.toml.

If #106 gets support this doesn't matter because the file is deleted, can we leave it for now?

OK, concept ACK doing #106

Kixunil · 2024-09-06T04:27:07Z

fuzz/Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "hex-fuzz"
-edition = "2018"
+edition = "2021"
+rust-version = "1.63.0"


I wish we could pull these from workspace already... It's just one version away.

Kixunil · 2024-09-06T04:27:51Z

fuzz/generate-files.sh

+
+[lints.rust]
+unexpected_cfgs = { level = "deny", check-cfg = ['cfg(fuzzing)'] }
+EOF


This is unrelated but not a big deal.

Ah yes, you are correct, my bad. Will leave them in now.

Kixunil · 2024-09-06T04:30:28Z

fuzz/generate-files.sh

@@ -11,7 +11,8 @@ source "$REPO_DIR/fuzz/fuzz-util.sh"
 cat > "$REPO_DIR/fuzz/Cargo.toml" <<EOF
 [package]
 name = "hex-fuzz"
-edition = "2018"
+edition = "2021"
+rust-version = "1.63.0"


Since this is generated we should pull the value from single source.

Unrelated to this PR, right? Can we just put this in, I spent way too long on this extremely annoying PR already.

It's literally just replacing the line with $(grep '^rust-version ' "$REPO_DIR/Cargo.toml")

tcharding · 2024-09-09T04:45:28Z

Please see new PR description.

Rust 1.63.0 is in Debian stable, lets use it as our MSRV. Includes: - removal of clippy config file, allegedly no longer needed - required fuzz changes (toolchain, bump of `hongfuzz` version) - gets fields by grepping when generating the fuzz manifest - removes now unneeded pinning in CI script And includes unrelated fix by adding `unexpected_cfgs`.

Kixunil · 2024-09-09T04:50:46Z

I've modified the description to better describe what's going on.

Kixunil

ACK 5cd37e3

Kixunil · 2024-09-09T04:52:47Z

.github/workflows/rust.yaml

    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
    steps:
      - name: Checkout Crate
        uses: actions/checkout@v3
      - name: Checkout Toolchain
-        uses: dtolnay/rust-toolchain@1.56.1
+        uses: dtolnay/rust-toolchain@1.63.0


I'm not going to hold this because the PR is blocking a bunch of other work but this should be read from Cargo.toml in a previous step.

Holla if you can think of a better way of tracking issues across "core crates": rust-bitcoin/rust-bitcoin#3335

There are org-wide "projects" but I'm not sure if it's the right tool.

tcharding · 2024-09-09T04:56:48Z

Thanks, FWIW I did try to look up the clippy thing and couldn't find any docs, I did not want to claim something that I had not verified.

Kixunil · 2024-09-09T05:12:59Z

I could find it easily: https://doc.rust-lang.org/nightly/clippy/lint_configuration.html#msrv

I just put rust clippy configuration "rust-version" to google to verify that clippy is reading the field and the reason I came up with the idea to check it directly is that it's absolutely sensible/expected for clippy to read it.

tcharding · 2024-09-09T05:37:20Z

Lol, my search-foo needs improving.

tcharding · 2024-09-09T05:38:28Z

Oh and its because we didn't have a rust-version until we started using edition 2021.

Kixunil · 2024-09-09T07:01:25Z

It's not tied to edition, just to Rust version. But I don't remember which stabilized it and don't care to check.

apoelstra

ACK 5cd37e3 successfully ran local tests

apoelstra · 2024-09-09T14:50:13Z

Updated my local CI so that it will use rust-version from Cargo.toml if it's present, and only if it's not, fall back to msrv in clippy.toml (and use 1.56.1 if that's missing).

apoelstra · 2024-09-09T14:58:17Z

Hmm, this is gonna kill my performance for multi-workspace repos if I can't determine my compiler set until after I've split into multiple workspaces.

But ok, we can discuss that when we try to make that change for rust-bitcoin.

tcharding mentioned this pull request Sep 4, 2024

Remove core2 dependency #104

Closed

tcharding marked this pull request as draft September 4, 2024 02:12

tcharding force-pushed the 09-04-bump-msrv branch 2 times, most recently from 9272e14 to 62c60f7 Compare September 4, 2024 02:19

Kixunil reviewed Sep 4, 2024

View reviewed changes

tcharding force-pushed the 09-04-bump-msrv branch from 62c60f7 to 34f2d5d Compare September 5, 2024 06:08

tcharding marked this pull request as ready for review September 5, 2024 06:10

tcharding mentioned this pull request Sep 5, 2024

CI: Use run_task from maintainer-tools #106

Closed

tcharding force-pushed the 09-04-bump-msrv branch from 34f2d5d to 9a6e2ba Compare September 5, 2024 06:49

tcharding force-pushed the 09-04-bump-msrv branch 3 times, most recently from 3073bb1 to 60fb573 Compare September 5, 2024 23:13

tcharding force-pushed the 09-04-bump-msrv branch from 60fb573 to 7f2addf Compare September 6, 2024 01:04

Kixunil reviewed Sep 6, 2024

View reviewed changes

tcharding force-pushed the 09-04-bump-msrv branch from 7f2addf to 7650ab5 Compare September 9, 2024 04:44

tcharding force-pushed the 09-04-bump-msrv branch from 7650ab5 to 5cd37e3 Compare September 9, 2024 04:46

Kixunil approved these changes Sep 9, 2024

View reviewed changes

tcharding mentioned this pull request Sep 9, 2024

org-wide: Read MSRV from manifest in CI job rust-bitcoin/rust-bitcoin#3335

Open

apoelstra approved these changes Sep 9, 2024

View reviewed changes

apoelstra merged commit 9c82121 into rust-bitcoin:master Sep 9, 2024
11 checks passed

tcharding deleted the 09-04-bump-msrv branch October 15, 2024 01:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump MSRV to Rust 1.63.0 #102

Bump MSRV to Rust 1.63.0 #102

tcharding commented Sep 4, 2024 •

edited by Kixunil

Loading

tcharding commented Sep 4, 2024

tcharding commented Sep 4, 2024

Kixunil left a comment

tcharding commented Sep 5, 2024

tcharding commented Sep 5, 2024 •

edited

Loading

tcharding commented Sep 5, 2024

tcharding commented Sep 6, 2024

tcharding commented Sep 6, 2024 •

edited

Loading

Kixunil Sep 6, 2024

tcharding Sep 6, 2024

Kixunil Sep 6, 2024

tcharding Sep 6, 2024

Kixunil Sep 6, 2024

Kixunil Sep 6, 2024

Kixunil Sep 6, 2024

tcharding Sep 6, 2024 •

edited

Loading

Kixunil Sep 6, 2024

tcharding Sep 6, 2024

Kixunil Sep 6, 2024

tcharding commented Sep 9, 2024

Kixunil commented Sep 9, 2024

Kixunil left a comment

Kixunil Sep 9, 2024

tcharding Sep 9, 2024

Kixunil Sep 9, 2024

tcharding commented Sep 9, 2024 •

edited

Loading

Kixunil commented Sep 9, 2024

tcharding commented Sep 9, 2024

tcharding commented Sep 9, 2024

Kixunil commented Sep 9, 2024

apoelstra left a comment

apoelstra commented Sep 9, 2024

apoelstra commented Sep 9, 2024

		@@ -1 +1 @@
		msrv = "1.56.1"
		msrv = "1.63.0"

Bump MSRV to Rust 1.63.0 #102

Bump MSRV to Rust 1.63.0 #102

Conversation

tcharding commented Sep 4, 2024 • edited by Kixunil Loading

tcharding commented Sep 4, 2024

tcharding commented Sep 4, 2024

Kixunil left a comment

Choose a reason for hiding this comment

tcharding commented Sep 5, 2024

tcharding commented Sep 5, 2024 • edited Loading

tcharding commented Sep 5, 2024

tcharding commented Sep 6, 2024

tcharding commented Sep 6, 2024 • edited Loading

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

tcharding Sep 6, 2024 • edited Loading

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

tcharding commented Sep 9, 2024

Kixunil commented Sep 9, 2024

Kixunil left a 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

tcharding commented Sep 9, 2024 • edited Loading

Kixunil commented Sep 9, 2024

tcharding commented Sep 9, 2024

tcharding commented Sep 9, 2024

Kixunil commented Sep 9, 2024

apoelstra left a comment

Choose a reason for hiding this comment

apoelstra commented Sep 9, 2024

apoelstra commented Sep 9, 2024

tcharding commented Sep 4, 2024 •

edited by Kixunil

Loading

tcharding commented Sep 5, 2024 •

edited

Loading

tcharding commented Sep 6, 2024 •

edited

Loading

tcharding Sep 6, 2024 •

edited

Loading

tcharding commented Sep 9, 2024 •

edited

Loading