Bump MSRV to Rust version 1.56.1 by tcharding · Pull Request #2188 · rust-bitcoin/rust-bitcoin

tcharding · 2023-11-14T04:19:10Z

Rust version 1.56.0 introduced edition 2021. Shortly afterwards, on October 21 2021 Rust version 1.56.1 was released.

Debian stable is currently shipping rustc 1.63.0. Our stated MSRV policy is: In Debian stable and at least 2 years old. Therefore our MSRV policy is met by Rust version 1.56.1 and we can strat to bump our MSRV org wide. Start by bumping the rust-bitcoin and hashes MSRV to Rust 1.56.1

Start by bumping the rust-bitcoin and hashes MSRV to Rust 1.56.1, includes:

Update docs.
Update CI and remove pinning.
Update the build files and remove now stale cfg attributes rust_v_1_x for values less than the new MSRV.
Use new IntoIterator for arrays so we no longer need to allocate a vector to iterate.

Links:

Kixunil

While technically correct, it keeps MSRV_MINOR at 48 in build.rs. It might be nicer to bump it and remove #[cfg(rust_*)] for versions less than or equal to 1.56.

Further, this version stabilized the rust-version field in Cargo.toml and we should set it. It might reduce the burden of bumping the numbers in the future if we can pull them from that field. The release notes of Rust 1.56 specifically say "we encourage CI systems
that support Rust code to include a crate's specified minimum version in the test matrix for that crate by default." but I didn't check if our CI supports it.

I think doing these makes sense in this PR but wouldn't block it.

Kixunil · 2023-11-14T09:05:09Z

bitcoin/src/taproot.rs

Oh, yeah, IntoIterator in arrays! 🎉 🎉 🎉

tcharding · 2023-11-14T22:04:16Z

Implemented suggestions and squashed it all into a single patch, re-wrote git log and PR description to match new patch.

Kixunil

ACK e729589955bb2b39c5178f255fdd40c3b68b46ee

tcharding · 2023-11-14T22:16:39Z

Oh, sorry man was working while you reviewed. I added a patch to update to edition 2021.

Kixunil

ACK 4ab2c2889630a150bd02328623af2218a36d5aa5

Kixunil · 2023-11-14T22:43:17Z

Oh, I just notice you didn't set rust-version in Cargo.toml. Was it on purpose?

tcharding · 2023-11-15T00:50:52Z

Not on purpose, just an omission on my part. Will add

Kixunil

ACK 5afcc2b8d5cb6453eb680cc8b6f2cacc4667ede4

apoelstra · 2023-11-15T13:54:16Z

cc @TheBlueMatt @stevenroose I'll give you two a week to comment or veto this, or else I'll merge it on Wednesday Nov 22.

apoelstra

ACK 5afcc2b8d5cb6453eb680cc8b6f2cacc4667ede4

TheBlueMatt · 2023-11-15T17:37:22Z

Any chance we could delay this for a month or so? We're waiting on one user to confirm that our bump beyond 1.48 didn't break their platform due to the implied glibc bump that came with it.

apoelstra · 2023-11-15T17:49:58Z

@TheBlueMatt yep, for sure. We're in no particular rush.

Kixunil · 2023-11-15T17:59:24Z

Well it won't be released right now anyway so it shouldn't matter? Or is that user using our master branch?

TheBlueMatt · 2023-11-15T18:09:41Z

Right, my point was more that its possible it will break that users' platform, and in that case we'd be back to square one and would have to consider whether this makes sense or what approach we'd take to upgrade past 1.48.

TheBlueMatt · 2023-11-21T21:36:45Z

We've confirmed we're good to go. LDK will be bumping to 1.63 soon (lightningdevkit/rust-lightning#2681) so this can go ahead whenever.

tcharding · 2023-11-22T03:09:07Z

Thanks man! Rebased.

vincenzopalazzo

ACK dda8765

apoelstra · 2023-11-22T13:21:30Z

Might as well do it now then, since we don't have a major release planned til April.

apoelstra

ACK dda8765827e6d8807f4cac8e5186a20348718d64

Rust version 1.56.0 introduced edition 2021. Shortly afterwards, on October 21 2021 Rust version 1.56.1 was released. Debian stable is currently shipping `rustc 1.63.0`. Our stated MSRV policy is: In Debian stable and at least 2 years old. Therefore our MSRV policy is met by Rust version 1.56.1 and we can strat to bump our MSRV org wide. Start by bumping the `rust-bitcoin` and `hashes` MSRV to Rust 1.56.1, includes: - Update docs. - Update CI and remove pinning. - Update the build files and remove now stale cfg attributes rust_v_1_x for values less than the new MSRV. - Use new `IntoIterator` for arrays so we no longer need to allocate a vector to iterate. Links: - https://blog.rust-lang.org/2021/11/01/Rust-1.56.1.html - https://blog.rust-lang.org/2021/10/21/Rust-1.56.0.html - https://packages.debian.org/stable/rust/rustc

We just bumped the MSRV to Rust 1.56.1 which includes edition 2021. Update all crates in this repo to use edition 2021 and build/lint warnings.

Add `rust-version = 1.56.1` to all crates in the workspace i.e., including `fuzz` but excluding the various test crates.

tcharding · 2023-11-22T19:20:22Z

Rebased, no other changes.

apoelstra

ACK dda8765827e6d8807f4cac8e5186a20348718d64

Kixunil

ACK 4d5415f

Kixunil · 2023-11-23T16:40:23Z

Cargo.toml

@@ -1,5 +1,6 @@
 [workspace]


We should be able to remove all use statements importing TryFrom and TryInto now. Fine to do in as separate PR.

Unusualy, clippy told me about a few instances of TryInto but all of them. And none of the TryFrom. I opened some files to play with clippy and ended up just doing the patch to remove them all. Its on top.

Now that MSRV is Rust 1.56.1 we no longer need to explicitly import `TryFrom` and `TryInto`. No clue why clippy didn't find these for us.

Kixunil

ACK 761de88

apoelstra

ACK 761de88

yancyribbens · 2023-11-25T12:10:20Z

contrib/test.sh

-MSRV="1\.48\.0"
-
-# Test pinned versions.
-if cargo --version | grep ${MSRV}; then


apoelstra

ACK 761de88

tcharding mentioned this pull request Nov 14, 2023

push-based decoding #2184

Closed

Kixunil reviewed Nov 14, 2023

View reviewed changes

bitcoin/src/taproot.rs Outdated

Copy link
Copy Markdown

Collaborator

Kixunil Nov 14, 2023

Choose a reason for hiding this comment

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

Oh, yeah, IntoIterator in arrays! 🎉 🎉 🎉

tcharding force-pushed the 11-14-bump-msrv branch 3 times, most recently from c084746 to e729589 Compare November 14, 2023 22:03

Kixunil previously approved these changes Nov 14, 2023

View reviewed changes

tcharding dismissed Kixunil’s stale review via 4ab2c28 November 14, 2023 22:16

Kixunil previously approved these changes Nov 14, 2023

View reviewed changes

This was referenced Nov 14, 2023

Add integer operations for locktime Height types #2181

Closed

WIP: Calculate next target #2180

Closed

tcharding dismissed Kixunil’s stale review via 5afcc2b November 15, 2023 00:55

Kixunil previously approved these changes Nov 15, 2023

View reviewed changes

apoelstra previously approved these changes Nov 15, 2023

View reviewed changes

tcharding dismissed stale reviews from apoelstra and Kixunil via dda8765 November 22, 2023 03:08

tcharding force-pushed the 11-14-bump-msrv branch from 5afcc2b to dda8765 Compare November 22, 2023 03:08

vincenzopalazzo approved these changes Nov 22, 2023

View reviewed changes

apoelstra previously approved these changes Nov 22, 2023

View reviewed changes

tcharding added 3 commits November 23, 2023 06:20

Update to edition 2021

a41e978

We just bumped the MSRV to Rust 1.56.1 which includes edition 2021. Update all crates in this repo to use edition 2021 and build/lint warnings.

Add rust-version to the workspace manifests

4d5415f

Add `rust-version = 1.56.1` to all crates in the workspace i.e., including `fuzz` but excluding the various test crates.

tcharding dismissed apoelstra’s stale review via 4d5415f November 22, 2023 19:20

tcharding force-pushed the 11-14-bump-msrv branch from dda8765 to 4d5415f Compare November 22, 2023 19:20

apoelstra previously approved these changes Nov 22, 2023

View reviewed changes

Kixunil previously approved these changes Nov 23, 2023

View reviewed changes

Remove imports of TryFrom and TryInto

761de88

Now that MSRV is Rust 1.56.1 we no longer need to explicitly import `TryFrom` and `TryInto`. No clue why clippy didn't find these for us.

tcharding dismissed stale reviews from Kixunil and apoelstra via 761de88 November 23, 2023 16:53

Kixunil approved these changes Nov 23, 2023

View reviewed changes

apoelstra approved these changes Nov 24, 2023

View reviewed changes

yancyribbens reviewed Nov 25, 2023

View reviewed changes

contrib/test.sh

MSRV="1\.48\.0"

# Test pinned versions.

if cargo --version | grep ${MSRV}; then

Copy link
Copy Markdown

Contributor

yancyribbens Nov 25, 2023

Choose a reason for hiding this comment

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

Nice!

apoelstra approved these changes Nov 25, 2023

View reviewed changes

apoelstra merged commit 4806461 into rust-bitcoin:master Nov 26, 2023

tcharding deleted the 11-14-bump-msrv branch November 27, 2023 22:16

Conversation

tcharding commented Nov 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Kixunil left a comment

Choose a reason for hiding this comment

Uh oh!

Kixunil Nov 14, 2023

Choose a reason for hiding this comment

Uh oh!

tcharding commented Nov 14, 2023

Uh oh!

Kixunil left a comment

Choose a reason for hiding this comment

Uh oh!

tcharding commented Nov 14, 2023

Uh oh!

Kixunil left a comment

Choose a reason for hiding this comment

Uh oh!

Kixunil commented Nov 14, 2023

Uh oh!

tcharding commented Nov 15, 2023

Uh oh!

Kixunil left a comment

Choose a reason for hiding this comment

Uh oh!

apoelstra commented Nov 15, 2023

Uh oh!

apoelstra left a comment

Choose a reason for hiding this comment

Uh oh!

TheBlueMatt commented Nov 15, 2023

Uh oh!

apoelstra commented Nov 15, 2023

Uh oh!

Kixunil commented Nov 15, 2023

Uh oh!

TheBlueMatt commented Nov 15, 2023

Uh oh!

TheBlueMatt commented Nov 21, 2023

Uh oh!

tcharding commented Nov 22, 2023

Uh oh!

vincenzopalazzo left a comment

Choose a reason for hiding this comment

Uh oh!

apoelstra commented Nov 22, 2023

Uh oh!

apoelstra left a comment

Choose a reason for hiding this comment

Uh oh!

tcharding commented Nov 22, 2023

Uh oh!

apoelstra left a comment

Choose a reason for hiding this comment

Uh oh!

Kixunil left a comment

Choose a reason for hiding this comment

Uh oh!

Kixunil Nov 23, 2023

Choose a reason for hiding this comment

Uh oh!

tcharding Nov 23, 2023

Choose a reason for hiding this comment

Uh oh!

Kixunil left a comment

Choose a reason for hiding this comment

Uh oh!

apoelstra left a comment

Choose a reason for hiding this comment

Uh oh!

yancyribbens Nov 25, 2023

Choose a reason for hiding this comment

Uh oh!

apoelstra left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

tcharding commented Nov 14, 2023 •

edited

Loading