Skip to content

Edition 2018 clean up#113

Merged
str4d merged 20 commits into
zcash:masterfrom
Eirik0:edition-2018-clean-up
Aug 23, 2019
Merged

Edition 2018 clean up#113
str4d merged 20 commits into
zcash:masterfrom
Eirik0:edition-2018-clean-up

Conversation

@Eirik0

@Eirik0 Eirik0 commented Aug 20, 2019

Copy link
Copy Markdown
Contributor

This PR runs cargo fix --edition and cargo fix --edition-idioms on all of the modules which needed it, and includes some warning cleanup along the way. The folders zcash_primitives/benches/... and pairing/benches/... were omitted when running the fix because they depend on unstable features, so it is possible that they no longer work. @ebfull suggested updating the benchmarks to use https://docs.rs/criterion/0.2.11/criterion/ which could be done as part of this PR, but might make more sense to be done as follow up.

Closes #97.

@Eirik0

Eirik0 commented Aug 20, 2019

Copy link
Copy Markdown
Contributor Author

There is a typo in one of the commit messages, and it looks like this will fail CI due needing a cargo fmt. This will be fixed shortly.

@Eirik0 Eirik0 changed the title Edition 2018 clean up [WIP] Edition 2018 clean up Aug 20, 2019
@Eirik0 Eirik0 force-pushed the edition-2018-clean-up branch from 56965a7 to 76795a9 Compare August 21, 2019 04:27

impl ::std::fmt::Display for $affine {
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Note: In pairing I did a find and replace on ::std::fmt::Formatter/::std::fmt::Formatter<'_>. cargo fix --edition-idioms would fail here and try to double add the <'_>.

@Eirik0 Eirik0 changed the title [WIP] Edition 2018 clean up Edition 2018 clean up Aug 21, 2019
@Eirik0 Eirik0 requested review from ebfull and str4d August 21, 2019 05:44

@str4d str4d left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

ACK mod comments, but zcash_proofs has not been editionized.

Comment thread zcash_primitives/src/jubjub/fs.rs Outdated
Comment thread zcash_primitives/src/jubjub/fs.rs Outdated
Comment thread bellman/src/lib.rs
#[cfg(feature = "multicore")]
extern crate crossbeam;
#[cfg(feature = "multicore")]
extern crate futures_cpupool;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why does this multicore-conditional extern crate disappear, but not the other two?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

extern crate hex_literal stays as expected because of the #[macro_use].

Comment thread bellman/src/lib.rs
extern crate rand;

#[cfg(test)]
extern crate rand_xorshift;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why does this test-conditional extern crate disappear, but not the extern crate rand?

Eirik Ogilvie-Wigley and others added 3 commits August 21, 2019 16:11
@Eirik0

Eirik0 commented Aug 21, 2019

Copy link
Copy Markdown
Contributor Author

ACK mod comments, but zcash_proofs has not been editionized.

There were no changes when running cargo fix --edition, so I guess I didn't do the subsequent steps. This is now fixed.

@str4d str4d added this to the v0.1.0 milestone Aug 22, 2019
@str4d str4d mentioned this pull request Aug 23, 2019
@ebfull ebfull mentioned this pull request Aug 23, 2019
@str4d str4d merged commit ad33798 into zcash:master Aug 23, 2019
greg0x pushed a commit to valargroup/librustzcash that referenced this pull request Mar 12, 2026
* Add Validator setup, automate app.toml update

* Fix lucide-react title prop TS error on icon components

Wrap ShieldCheck and ShieldAlert icons in <span> elements for the title
attribute, since this lucide-react version doesn't accept title as a prop.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* Remove chain-rounds references deleted on main

ChainRoundsView and Server import were removed in main but
incorrectly kept during merge conflict resolution.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* Show "Connect admin wallet" button in publish modal when no wallet connected

Instead of showing an error after clicking publish, the modal now
shows a "Connect admin wallet" button that navigates to Settings.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* Fix missing onGoToSettings destructure in PublishModal

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* Show inline wallet connect in publish modal instead of navigating to settings

When no wallet is connected, the publish modal now shows Keplr and
dev-key connection options directly. Once connected it switches to
the normal publish confirmation view.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* Remove Downloads from sidebar

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* Remove unused Download import from Sidebar

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
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.

Migrate all crates to 2018 edition

3 participants