Merged
Conversation
Closed
tcharding
force-pushed
the
edition-2018
branch
7 times, most recently
from
715f510 to
85afd86
Compare
dunxen
previously approved these changes
May 3, 2022
Contributor
dunxen
left a comment
dunxen
left a comment
There was a problem hiding this comment.
cr-ACK 85afd86
Verified 060fb32 by running cargo fix --edition on bcc923c and committing to yield local commit de5b6d3. git diff de5b6d3 060fb32 returns no changes.
Reviewed 85afd86 changes manually.
LGTM
apoelstra
previously approved these changes
May 4, 2022
Member
apoelstra
left a comment
apoelstra
left a comment
There was a problem hiding this comment.
ACK 85afd86065799c980dfcca2c0db1e4bd6bae0a75
This all looks good to me.
Use cargo to upgrade from edition 2015 to edition 2018. cargo fix --edition No manual changes made. The result of the command above is just to fix all the use statements (add `crate::`) and fix the fully qualified path formats i.e., `::Foo` -> `crate::Foo`.
Add 'edition = "2018"' to the manifest and do a bunch of manual path fixups (use statements and fully qualified paths).
Member
Author
|
Rebased |
20 tasks
dunxen
approved these changes
May 11, 2022
Member
Author
|
Thanks for the reviews @dunxen! |
apoelstra
approved these changes
May 13, 2022
Member
Author
|
Not much interest in this one, I'm surprised. I'm personally pretty excited to get edition 2018 into the rust-bitcoin stack and the improvements that can be done on top of it. Can we get this one in crew? |
RCasatta
approved these changes
May 16, 2022
Collaborator
RCasatta
left a comment
RCasatta
left a comment
There was a problem hiding this comment.
ACK 9f0c687,
my cargo fix --edition didn't produce exactly dca0d67, but differences are minimal
--- a/src/blockdata/witness.rs
+++ b/src/blockdata/witness.rs
@@ -302,12 +302,12 @@ impl<'de> serde::Deserialize<'de> for Witness {
#[cfg(test)]
mod test {
- use crate::blockdata::transaction::EcdsaSighashType;
- use crate::blockdata::witness::Witness;
+ use super::*;
+
use crate::consensus::{deserialize, serialize};
use crate::hashes::hex::{FromHex, ToHex};
use crate::Transaction;
- use secp256k1::ecdsa;
+ use crate::secp256k1::ecdsa;
Member
Author
|
Thanks @RCasatta! |
Member
|
Nice, let's do it! |
Member
|
Likely to cause rebase issues but very simple ones. (And actually maybe not, since it mostly only touches import statements..) |
Member
Author
|
BOOM! |
ChallengeDev210
pushed a commit
to ChallengeDev210/rust-bitcoin
that referenced
this pull request
Aug 1, 2022
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 runningcargo fix --editionon 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 :)