Edition 2018 #635

Kixunil · 2021-07-29T10:02:32Z

This changes edition to 2018 with a bunch of semi-automated fixes.
I suggest keeping #510 open because this doesn't implement all things mentioned there.

The diff is large but each change should be trivial/obvious.

This is the result of running: ``` cargo +1.36.0 fix --edition --all --broken-code --features="base64,rand,use-serde" ``` And manually fixing [cargo fix bug](rust-lang/rust#87578)

This changes edition to 2018 and manually fixes a few leftover paths.

All crates currently work with 1.36, so pinning is not needed.

Ran command: ``` cargo +1.36.0 fix --edition-idioms --all --broken-code --features="base64,rand,use-serde" ``` And manually fixed mistakes. Also looks like it didn't strip `::` from `::core`, so this was done "manually" (regex) too.

Was probably pasted accidentally.

examples/bip32.rs

These were added during conversion to edition 2018.

thomaseizinger

Nice work, thanks for pushing this forward!

I think to merge, @apoelstra wants every commit to pass CI so we will need to squash almost all of this together into one.

It is a noisy diff but easy to to go through. Concept ACK from my side. As done here, only the minimally needed changes should be good to merge this. Refinements can be done in follow-ups!

Kixunil · 2021-08-03T06:03:59Z

I intend to squash it all into one commit as it'd be quite annoying to rewrite history. (I know how to do it and I did it several times but in this case I expect it to be too much work.) Does anyone wish to keep some steps?

dr-orlovsky

utACK. The amount of painstaking work here is very impressive. I do confirm that these changes are nothing else than just

Change of :: prefixes to crate::
Removal of unnecessary extern crate imports
Addition of lifetime placeholders (<'_>) where they are required

I left few Nits and further optimization questions since this will require squash anyway.

All other improvements related to 2018 edition should be clearly done with a separate PRs in very small sets, otherwise it will take forever to review and merge.

dr-orlovsky · 2021-08-09T20:14:51Z

contrib/test.sh

@@ -10,15 +10,10 @@ fi

 pin_common_verions() {


Nit: I think we can rename this into cleanup

I was thinking of keeping it if some dependencies update their MSRV. But not really sure if it's better than renaming.

src/lib.rs

src/network/message_blockdata.rs

src/util/psbt/macros.rs

This removes needless `extern crate` and changes `pub use x` to `pub extern crate x` which is more clear in its intent.

Kixunil · 2021-08-10T06:18:19Z

@dr-orlovsky resolved nits except the naming which I'm unsure about which semantics we want to keep.

Thankfully it was not that painstaking - despite its flaws cargo fix is quite handy. :)

The `test` crate is provided by the compiler and seems to be exceptional in needing `extern crate test` declaration.

dr-orlovsky

utACK, will do a thorough tests later

dr-orlovsky

Few more comments after line-checking diff with the previous version

dr-orlovsky · 2021-08-10T07:53:10Z

src/blockdata/transaction.rs

-impl str::FromStr for SigHashType {
+impl core::str::FromStr for SigHashType {


How this was working with no_std before?

No clue, I was surprised as well.

src/lib.rs

apoelstra · 2021-09-08T21:18:46Z

concept ACK. I'd like to first get a breaking version out that implements Taproot and nothing else, which could mean rebasing this several times, unfortunately. But the alternative is probably to rebase every single other PR, and we're running out of pre-Taproot time..

I'm willing to make an exception to the "every commit passes" rule for something like this.

Kixunil · 2021-09-09T09:09:42Z

I'm fine with Taproot and nothing else approach. I didn't have much time for this lately anyway.

tcharding · 2022-04-26T22:03:55Z

~~Are you planning on updating this PR @Kixunil? All the 'before edition bump' PRs are ack'ed and ready to merge.~~ Don't mind me, we need those to merge first, right, that was the point :)

sanket1729 · 2022-04-30T22:30:13Z

@Kixunil Everything with the label has been resolved. We can now proceed with this PR.

Kixunil · 2022-05-02T12:30:33Z

OK, I expect this week to be intense for me. If anyone has the time you can overtake. If not, I will try next week or even this one if I get lucky.

tcharding · 2022-05-02T23:14:30Z

If anyone has the time you can overtake.

Done, thanks for blessing me to do so. #983.

I'm going to close this so as folk don't get confused.

@Kixunil

9f0c687 Enable edition 2018 (Tobin C. Harding) dca0d67 Fix in preparation for next edition (Tobin C. Harding) Pull request description: This PR supersedes #635 at the permission of @Kixunil in the thread of that PR. Do a minimal set of changes to enable edition 2018. Patch 1 is the biggest change set, it is done with `cargo`, no other manual changes are included in patch 1. It can verified by running `cargo fix --edition` on master and checking the diffs are the same. Patch 2 enables 2018 and includes all the manual changes required to get the code to build (with _all_ the feature combinations :) ACKs for top commit: dunxen: re-ACK 9f0c687 apoelstra: re-ACK 9f0c687 RCasatta: ACK 9f0c687, Tree-SHA512: 7c23554adb4c1dd932af1e80f04397bad0418b4fdae2d0fe243c3f19ba1169686a386bffd38a3c02871c7544b5a7bc8af525b50617a2695726408c091700f081

Kixunil added 7 commits July 29, 2021 11:04

Edition 2018: apply cargo fix --edition

592c4f7

This is the result of running: ``` cargo +1.36.0 fix --edition --all --broken-code --features="base64,rand,use-serde" ``` And manually fixing [cargo fix bug](rust-lang/rust#87578)

Edition changed to 2018

96ad2fe

This changes edition to 2018 and manually fixes a few leftover paths.

Update information about MSRV to 1.36

1c14e61

Drop dependency pinning

2d9ab34

All crates currently work with 1.36, so pinning is not needed.

Bump Rust version in CI to 1.36

794e5de

Applied cargo fix --edition-idioms

6e4fd66

Ran command: ``` cargo +1.36.0 fix --edition-idioms --all --broken-code --features="base64,rand,use-serde" ``` And manually fixed mistakes. Also looks like it didn't strip `::` from `::core`, so this was done "manually" (regex) too.

Removed random WTF line

60ff2f3

Was probably pasted accidentally.

thomaseizinger reviewed Jul 30, 2021

View reviewed changes

examples/bip32.rs Outdated Show resolved Hide resolved

Kixunil added 2 commits July 30, 2021 11:38

Removed bunch of empty lines

dcf3214

These were added during conversion to edition 2018.

Fixed io_extras import.

471587f

Kixunil mentioned this pull request Aug 2, 2021

impl PartialOrd/Ord for PublicKey #524

Closed

Kixunil added 2 commits August 2, 2021 23:08

Fixed broken import

e675503

Fixed unstable feature imports

b2b08fa

thomaseizinger previously approved these changes Aug 2, 2021

View reviewed changes

Kixunil mentioned this pull request Aug 3, 2021

Use rustdoc::broken_intra_doc_links #638

Closed

dr-orlovsky previously approved these changes Aug 9, 2021

View reviewed changes

This was referenced Aug 9, 2021

Change Cargo.toml serde dev deps #495

Closed

Rust 2018 & MSRV bump 1.41.1 tracking issue #510

Closed

dr-orlovsky added this to In progress in Refactoring via automation Aug 9, 2021

dr-orlovsky added the API break This PR requires a version bump for the next release label Aug 9, 2021

Kixunil added 3 commits August 10, 2021 08:05

extern crate cleanup

57aa818

This removes needless `extern crate` and changes `pub use x` to `pub extern crate x` which is more clear in its intent.

Removed useless imports of Default

26fcd93

Added missing core:: prefix to str::FromStr

7eb1f15

Kixunil dismissed stale reviews from dr-orlovsky and thomaseizinger via 7eb1f15 August 10, 2021 06:15

Refactoring automation moved this from In progress to Review in progress Aug 10, 2021

Reintroduce extern crate test;

de291dd

The `test` crate is provided by the compiler and seems to be exceptional in needing `extern crate test` declaration.

dr-orlovsky approved these changes Aug 10, 2021

View reviewed changes

dr-orlovsky reviewed Aug 10, 2021

View reviewed changes

dr-orlovsky approved these changes Aug 12, 2021

View reviewed changes

Kixunil added this to the 0.29.0 milestone Nov 18, 2021

tcharding mentioned this pull request Nov 25, 2021

Implement TryFrom #720

Closed

tcharding mentioned this pull request May 2, 2022

Edition 2018 #983

Merged

tcharding closed this May 2, 2022

Refactoring automation moved this from Review in progress to Done May 2, 2022

Kixunil deleted the edition-2018 branch May 24, 2022 09:38

Kixunil removed this from the 0.29.0 milestone Aug 1, 2022

tcharding mentioned this pull request Jul 26, 2023

WIP: Use the new error stuff from secp #1956

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Edition 2018 #635

Edition 2018 #635

Kixunil commented Jul 29, 2021

thomaseizinger left a comment

Kixunil commented Aug 3, 2021

dr-orlovsky left a comment

dr-orlovsky Aug 9, 2021

Kixunil Aug 10, 2021

Kixunil commented Aug 10, 2021

dr-orlovsky left a comment

dr-orlovsky left a comment

dr-orlovsky Aug 10, 2021

Kixunil Aug 10, 2021

apoelstra commented Sep 8, 2021

Kixunil commented Sep 9, 2021

tcharding commented Apr 26, 2022 •

edited

sanket1729 commented Apr 30, 2022 •

edited

Kixunil commented May 2, 2022

tcharding commented May 2, 2022

		impl str::FromStr for SigHashType {
		impl core::str::FromStr for SigHashType {

Edition 2018 #635

Edition 2018 #635

Conversation

Kixunil commented Jul 29, 2021

thomaseizinger left a comment

Choose a reason for hiding this comment

Kixunil commented Aug 3, 2021

dr-orlovsky left a comment

Choose a reason for hiding this comment

dr-orlovsky Aug 9, 2021

Choose a reason for hiding this comment

Kixunil Aug 10, 2021

Choose a reason for hiding this comment

Kixunil commented Aug 10, 2021

dr-orlovsky left a comment

Choose a reason for hiding this comment

dr-orlovsky left a comment

Choose a reason for hiding this comment

dr-orlovsky Aug 10, 2021

Choose a reason for hiding this comment

Kixunil Aug 10, 2021

Choose a reason for hiding this comment

apoelstra commented Sep 8, 2021

Kixunil commented Sep 9, 2021

tcharding commented Apr 26, 2022 • edited

sanket1729 commented Apr 30, 2022 • edited

Kixunil commented May 2, 2022

tcharding commented May 2, 2022

tcharding commented Apr 26, 2022 •

edited

sanket1729 commented Apr 30, 2022 •

edited