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

Enforce Rust edition 2021 #3332

Merged
merged 17 commits into from
Jan 14, 2022
Merged

Enforce Rust edition 2021 #3332

merged 17 commits into from
Jan 14, 2022

Conversation

dconnolly
Copy link
Contributor

Motivation

We've wanted to comply with Rust 2021 edition for a bit:
#2709

Solution

Upgraded the Cargo.tomls to edition = 2021, did a little cargo fix --edition in each crate, ran tests, did a little clippy fix, and only had to tweak a few lines. 🎉

Resolves #2709

Review

Anyone can review, maybe @jvff @conradoplg

Reviewer Checklist

  • All tests and clippy pass

@dconnolly dconnolly requested review from conradoplg, jvff and a team January 12, 2022 03:40
@dconnolly dconnolly self-assigned this Jan 12, 2022
@codecov
Copy link

codecov bot commented Jan 12, 2022

Codecov Report

Merging #3332 (63535fa) into main (ece2d0f) will decrease coverage by 0.13%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #3332      +/-   ##
==========================================
- Coverage   78.02%   77.88%   -0.14%     
==========================================
  Files         266      266              
  Lines       31483    31447      -36     
==========================================
- Hits        24564    24494      -70     
- Misses       6919     6953      +34     

@gustavovalverde
Copy link
Member

Mmm...this must have been captured by Mergify, as all the conditions are met. If possible, please do not merge it manually so I can check what's going on.

@jvff
Copy link
Contributor

jvff commented Jan 12, 2022

Mmm...this must have been captured by Mergify, as all the conditions are met. If possible, please do not merge it manually so I can check what's going on.

Is it because there are two reviewers in the PR, and only one approval?

Copy link
Contributor

@conradoplg conradoplg left a comment

Choose a reason for hiding this comment

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

Looks good, I'll approve to check if it makes any difference to mergify...

@gustavovalverde
Copy link
Member

@Mergifyio refresh

@mergify
Copy link
Contributor

mergify bot commented Jan 14, 2022

refresh

✅ Pull request refreshed

@mergify mergify bot merged commit 89b0403 into main Jan 14, 2022
@mergify mergify bot deleted the rust-edition-2021 branch January 14, 2022 12:10
mergify bot pushed a commit that referenced this pull request May 23, 2023
* ZIPs were updated to remove ambiguity, this was tracked in #1267.

* #2105 was fixed by #3039 and #2379 was closed by #3069

* #2230 was a duplicate of #2231 which was closed by #2511

* #3235 was obsoleted by #2156 which was fixed by #3505

* #1850 was fixed by #2944, #1851 was fixed by #2961 and #2902 was fixed by #2969

* We migrated to Rust 2021 edition in Jan 2022 with #3332

* #1631 was closed as not needed

* #338 was fixed by #3040 and #1162 was fixed by #3067

* #2079 was fixed by #2445

* #4794 was fixed by #6122

* #1678 stopped being an issue

* #3151 was fixed by #3934

* #3204 was closed as not needed

* #1213 was fixed by #4586

* #1774 was closed as not needed

* #4633 was closed as not needed

* Clarify behaviour of difficulty spacing

Co-authored-by: teor <teor@riseup.net>

* Update comment to reflect implemented behaviour

Co-authored-by: teor <teor@riseup.net>

* Update comment to reflect implemented behaviour when retrying block downloads

Co-authored-by: teor <teor@riseup.net>

* Update `TODO` to remove closed issue and clarify when we might want to fix

Co-authored-by: teor <teor@riseup.net>

* Update `TODO` to remove closed issue and clarify what we might want to change in future

Co-authored-by: teor <teor@riseup.net>

* Clarify benefits of how we do block verification

Co-authored-by: teor <teor@riseup.net>

* Fix rustfmt errors

---------

Co-authored-by: teor <teor@riseup.net>
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.

Upgrade Zebra to Rust 2021 edition
4 participants