Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

remove the deprecated options in rustfmt.toml #5616

Merged
merged 3 commits into from
May 19, 2017

Conversation

guanqun
Copy link
Contributor

@guanqun guanqun commented May 14, 2017

The old rustfmt.toml can't work with latest rustfmt. Some of these configs in rustfmt have been either removed or renamed. So updating this file to reflect these changes. This should be a good starting point for our new coding standards in parity.

@tomusdrw
Copy link
Collaborator

Awesome! Did you try to run rustfmt against the codebase? What are the results?

@guanqun
Copy link
Contributor Author

guanqun commented May 15, 2017

 build.rs                           |   7 +-
 parity/account.rs                  |  26 ++--
 parity/blockchain.rs               | 166 ++++++++-----------------
 parity/boot.rs                     |  50 ++++----
 parity/cache.rs                    |   3 +-
 parity/cli/mod.rs                  | 768 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------
 parity/configuration.rs            | 681 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
 parity/dapps.rs                    |  85 +++++--------
 parity/deprecated.rs               |  78 ++++++------
 parity/dir.rs                      |  59 +++++----
 parity/helpers.rs                  | 139 ++++++++-------------
 parity/informant.rs                |  57 ++++-----
 parity/ipfs.rs                     |  12 +-
 parity/light_helpers/queue_cull.rs |  38 ++++--
 parity/main.rs                     | 104 +++++++++-------
 parity/migration.rs                |  34 +++--
 parity/modules.rs                  | 110 +++++++----------
 parity/params.rs                   |  61 +++++----
 parity/presale.rs                  |   2 +-
 parity/rpc.rs                      |  93 +++++---------
 parity/rpc_apis.rs                 | 297 ++++++++++++++++++++++----------------------
 parity/run.rs                      | 318 ++++++++++++++++++++---------------------------
 parity/secretstore.rs              |  28 ++---
 parity/signer.rs                   |  58 +++------
 parity/snapshot.rs                 | 101 ++++++---------
 parity/stratum.rs                  |  86 +++++--------
 parity/sync.rs                     |  55 +++------
 parity/upgrade.rs                  |  49 ++++----
 parity/url.rs                      |  12 +-
 parity/user_defaults.rs            |  61 +++++----
 30 files changed, 1701 insertions(+), 1937 deletions(-)

There are thousands of lines of changes... Do you want me to create a code review for this?

@guanqun
Copy link
Contributor Author

guanqun commented May 15, 2017

I created another PR here: #5624

I'd like to get this PR merged, but leave the other one abandoned, unless we agree on a good style. :)

And looks like our parity is not a workspace yet, so only run fmt on parity, not all submodules.

@5chdn 5chdn added A0-pleasereview 🤓 Pull request needs code review. A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update). labels May 16, 2017
@guanqun
Copy link
Contributor Author

guanqun commented May 17, 2017

I closed the other PR and hopefully we can get this small changes merged in.

Anything I should fix?

@gavofyork gavofyork added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update). labels May 19, 2017
@gavofyork
Copy link
Contributor

looks good! thanks @guanqun !

@gavofyork gavofyork merged commit d10ade1 into openethereum:master May 19, 2017
@guanqun guanqun deleted the fix-rustfmt branch May 19, 2017 15:20
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants