Skip to content

Commit d58e292

Browse files
Add rustfmt config and travis integration.
1 parent 3b76c77 commit d58e292

File tree

3 files changed

+36
-0
lines changed

3 files changed

+36
-0
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ before_install:
1111
- sudo apt-get install -y binutils-dev libunwind8-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc binutils-dev libiberty-dev
1212

1313
script:
14+
# Check formatting.
15+
- if [ "$(rustup show | grep default | grep stable)" != "" ]; then rustup component add rustfmt && cargo fmt --all -- --check; fi
16+
- if [ "$(rustup show | grep default | grep 1.34.2)" != "" ]; then rustup component add rustfmt && cd fuzz && cargo fmt --all -- --check && cd ../; fi
1417
# Build workspaces with Rust stable, beta, and 1.34.0
1518
- if [ "$(rustup show | grep default | grep 1.22.0)" == "" ]; then RUSTFLAGS="-C link-dead-code" cargo build --verbose; fi
1619
# Build lightning workspace with Rust 1.22.0

fuzz/rustfmt.toml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Non-defaults
2+
hard_tabs = true # use tab characters for indentation, spaces for alignment
3+
use_field_init_shorthand = true
4+
max_width = 5000 # Initially set this to a big number to split the diff of the formatter into multiple commits.
5+
6+
# Default
7+
edition = "2015"
8+
force_explicit_abi = true
9+
merge_derives = true
10+
newline_style = "Auto" # Unix or Windows line endings
11+
remove_nested_parens = true
12+
reorder_imports = true
13+
reorder_modules = true
14+
tab_spaces = 4
15+
use_small_heuristics = "Default"
16+
use_try_shorthand = false

rustfmt.toml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Non-defaults
2+
hard_tabs = true # use tab characters for indentation, spaces for alignment
3+
use_field_init_shorthand = true
4+
max_width = 5000 # Initially set this to a big number to split the diff of the formatter into multiple commits.
5+
6+
# Default
7+
edition = "2015"
8+
fn_args_layout = "Tall"
9+
force_explicit_abi = true
10+
merge_derives = true
11+
newline_style = "Auto" # Unix or Windows line endings
12+
remove_nested_parens = true
13+
reorder_imports = true
14+
reorder_modules = true
15+
tab_spaces = 4
16+
use_small_heuristics = "Default"
17+
use_try_shorthand = false

0 commit comments

Comments
 (0)