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
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ matrix:
rust: stable
before_script:
- rustup component add rustfmt
after_script:
- cargo fmt -- --check
- os: linux
rust: beta
- os: linux
Expand All @@ -22,6 +20,9 @@ matrix:
install:
- curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
script:
- if [ "$TRAVIS_RUST_VERSION" == "stable" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then
cargo fmt -- --check;
fi
- cargo check --all --tests
- cargo build --all
- cargo test --all --exclude uint --exclude fixed-hash
Expand Down
2 changes: 1 addition & 1 deletion ethbloom/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ impl<'a> From<Input<'a>> for Hash<'a> {
keccak256.update(raw);
keccak256.finalize(&mut out);
Hash::Owned(out)
},
}
Input::Hash(hash) => Hash::Ref(hash),
}
}
Expand Down
1 change: 1 addition & 0 deletions rustfmt.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
hard_tabs = true
max_width = 120
use_small_heuristics = "Max"
edition = "2018"