Skip to content

Commit ca121ae

Browse files
authored
update rustfmt from 2020-06-02 to 2020-07-26 (#76)
1 parent e4402dc commit ca121ae

File tree

4 files changed

+22
-7
lines changed

4 files changed

+22
-7
lines changed

.github/workflows/rust.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
- uses: actions/checkout@28c7f3d2b5162b5ddd3dfd9a45aa55eaf396478b
1818
- uses: actions-rs/toolchain@b223206e28798aa3c3668bdd6409258e6dc29172
1919
with:
20-
toolchain: nightly-2020-06-02
20+
toolchain: nightly-2020-07-26
2121
default: false
2222
components: rustfmt
2323
- name: Check style
24-
run: cargo +nightly-2020-06-02 fmt -- --check
24+
run: cargo +nightly-2020-07-26 fmt -- --check
2525

2626
build-and-test:
2727
runs-on: ${{ matrix.os }}

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"rust-analyzer.rustfmt.overrideCommand": [
33
"rustup",
44
"run",
5-
"nightly-2020-06-02",
5+
"nightly-2020-07-26",
66
"rustfmt"
77
]
88
}

README.adoc

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,28 @@ $ cargo +nightly doc
1616
----
1717

1818

19-
== Build and run
19+
== Contributing
20+
21+
=== Building and testing
2022

2123
You can **build and run the whole test suite** with `cargo test`. The test
2224
suite runs cleanly and should remain clean.
2325

24-
You can **format the code** using `cargo +nightly fmt`. Make sure to run this
25-
before pushing changes. The CI checks that the code is correctly formatted.
26+
=== Code formatting
27+
28+
Dropshot works with stable Rust versions, but for consistency the code is
29+
_formatted_ with a specific version of `rustfmt`. To contribute to Dropshot,
30+
you will need to have installed the `nightly-2020-07-26` version of the Rust
31+
toolchain:
32+
33+
----
34+
$ rustup install nightly-2020-07-26
35+
----
36+
37+
You can then **format the code** using `cargo +nightly-2020-07-26 fmt` or
38+
`rustfmt +nightly-2020-07-26`. Make sure to run this before pushing changes.
39+
The CI uses this version of `rustfmt` to check that the code is correctly
40+
formatted.
2641

2742

2843
== Configuration reference

rustfmt.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ use_field_init_shorthand = false
8383
force_explicit_abi = true
8484
condense_wildcard_suffixes = false
8585
color = "Auto"
86-
required_version = "1.4.15"
86+
required_version = "1.4.19"
8787
disable_all_formatting = false
8888
skip_children = false
8989
hide_parse_errors = false

0 commit comments

Comments
 (0)