Skip to content
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

Enable edition 2018 #365

Merged
merged 4 commits into from
May 2, 2022
Merged

Conversation

tcharding
Copy link
Member

Update the MSRV to Rust 1.41.1 and enable edition 2018.

I'm not sure how we want to merge these MSRV PRs across the stack but here is the rust-miniscript one.

Discussion: rust-bitcoin/rust-bitcoin#510 (comment)

@tcharding tcharding force-pushed the edition-2018 branch 2 times, most recently from 3e2f6e7 to b15c15d Compare April 22, 2022 03:20
@tcharding tcharding force-pushed the edition-2018 branch 2 times, most recently from 900ae8a to 9bbef67 Compare April 26, 2022 01:54
@sanket1729
Copy link
Member

I think the MSRV change can go in any order. I would like to get an external contributor #339 PR in first before we address this. That already has ACK from me, but would also like Andrew's ACK(it's a somewhat big change) before we proceed with it.

apoelstra
apoelstra previously approved these changes Apr 30, 2022
Copy link
Member

@apoelstra apoelstra left a comment

Choose a reason for hiding this comment

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

ACK 900ae8a

sanket1729
sanket1729 previously approved these changes Apr 30, 2022
Copy link
Member

@sanket1729 sanket1729 left a comment

Choose a reason for hiding this comment

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

ACK 9bbef67

@sanket1729
Copy link
Member

Sorry, this now conflicts after we got #339 in

tcharding added 4 commits May 2, 2022 09:13
Change the version of bitcoin to the latest 0.28 release.
It seems we have consensus within the rust-bitcoin github organisation
on bumping the MSRV to 1.41.1, update CI job and the README to reflect
this.
Use `cargo fix --edition` to update the codebase to edition 2018, the
only changes made are adding `crate::` prefix to use statements.

In addition; do a bunch of manual additions of `crate::`.

Includes `integration_test` crate also.
Run `cargo fix --edition-idioms`. This fixes uses of 'extern crate' and
also lifetimes that the compiler can infer.
@tcharding tcharding dismissed stale reviews from sanket1729 and apoelstra via c60bf1e May 1, 2022 23:39
@tcharding
Copy link
Member Author

Changes in force push:

  • Rebase on master
  • Fix commit: 08bce7a Update to use edition 2018 as needed

@tcharding
Copy link
Member Author

FTR please do not worry about merge conflicts caused by this PR in relation to any of my other PRs, I'm fine to rebase.

Copy link
Member

@sanket1729 sanket1729 left a comment

Choose a reason for hiding this comment

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

ACK c60bf1e. redid the entire process to match the diff.

@sanket1729 sanket1729 merged commit de74dc0 into rust-bitcoin:master May 2, 2022
@tcharding
Copy link
Member Author

BOOM! The first edition 2018 PR to be merged across the stack, way to go!

@tcharding tcharding deleted the edition-2018 branch May 3, 2022 00:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants