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

Use 2018 edition for rustfmt #266

Merged
merged 4 commits into from
Nov 26, 2019
Merged

Use 2018 edition for rustfmt #266

merged 4 commits into from
Nov 26, 2019

Conversation

zrzka
Copy link
Contributor

@zrzka zrzka commented Nov 20, 2019

Not sure about adding cargo fmt -- --check to .travis.yml (see #264), keeping it out for now.

Fixes #264

Signed-off-by: Robert Vojta <rvojta@me.com>
@parity-cla-bot
Copy link

It looks like @zrzka signed our Contributor License Agreement. 👍

Many thanks,

Parity Technologies CLA Bot

@ordian
Copy link
Member

ordian commented Nov 20, 2019

@zrzka we already have

- cargo fmt -- --check

it doesn't seem to be enforced, let's fix that

@zrzka
Copy link
Contributor Author

zrzka commented Nov 20, 2019

@ordian missed it, thanks. Travis CI:

The exit code of after_success, after_failure, after_script, after_deploy and subsequent stages do not affect the build result. However, if one of these stages times out, the build is marked as failed.

I think it should be enough to change after_script to script.

after_script exit codes are ignored and do not affect build status.

Signed-off-by: Robert Vojta <rvojta@me.com>
@ordian
Copy link
Member

ordian commented Nov 20, 2019

Please fix the formatting https://travis-ci.org/paritytech/parity-common/jobs/614448593#L217
Also, are you sure that the script section in stable doesn't override the global script section? We want to run both on stable.

Signed-off-by: Robert Vojta <rvojta@me.com>
Signed-off-by: Robert Vojta <rvojta@me.com>
@zrzka
Copy link
Contributor Author

zrzka commented Nov 20, 2019

Also, are you sure that the script section in stable doesn't override the global script section? We want to run both on stable.

It does. I moved it to the global script section:

script:
   - if [ "$TRAVIS_RUST_VERSION" == "stable" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then
     cargo fmt -- --check;
     fi

@dvdplm dvdplm merged commit 92ec182 into paritytech:master Nov 26, 2019
ordian added a commit that referenced this pull request Nov 27, 2019
* master:
  travis: try to fix wasmpack chrome test on macOS (#263)
  Use 2018 edition for rustfmt (#266)
  [fixed-hash]: re-export `alloc_` (#268)
  kvdb-web: async-awaitify (#259)
dvdplm added a commit that referenced this pull request Nov 28, 2019
…h/parity-common into ao-rocksdb-switch-to-upstream2

* 'ao-rocksdb-switch-to-upstream2' of github.com:paritytech/parity-common:
  kvdb-rocksdb: remove lz4 feature as it has no effect for now
  travis: try to fix wasmpack chrome test on macOS (#263)
  kvdb-rocksdb: please the CI
  kvdb-rocksdb: do not account for default column memory budget
  Use 2018 edition for rustfmt (#266)
  [fixed-hash]: re-export `alloc_` (#268)
  kvdb-web: async-awaitify (#259)
dvdplm added a commit that referenced this pull request Dec 10, 2019
* master:
  Compile triehash for no_std (#280)
  [kvdb-rocksdb] Use "pinned" gets to avoid allocations (#274)
  [kvdb-rocksdb] Release 0.2 (#273)
  [kvdb-rocksdb] switch to upstream (#257)
  travis: try to fix wasmpack chrome test on macOS (#263)
  Use 2018 edition for rustfmt (#266)
  [fixed-hash]: re-export `alloc_` (#268)
  kvdb-web: async-awaitify (#259)
  kvdb-rocksdb: configurable memory budget per column (#256)
  Bump rlp crate version. (#270)
  Introduce Rlp::at_with_offset method. (#269)
  Make fixed-hash test structs public (#267)
  Migrate primitive types to 2018 edition (#262)
  upgrade tiny-keccak to 2.0 (#260)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add edition 2018 to rustfmt.toml
4 participants