diff --git a/README.md b/README.md index 43b00f2c44ada674a650b7a00534fe21983da09d..fe0d438308067d23e23b888f43a864cff0d8e656 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,8 @@ We are providing our manual for Ion in the form of a markdown-based book, which ### Code Formatting -When submitting a pull request, be sure to run `cargo +nightly fmt` on your project with a +When submitting a pull request, be sure to run +`env CFG_RELEASE_CHANNEL=nightly cargo +nightly fmt` on your project with a nightly version of **rustfmt**. This will prevent me from having to push PR's specifically to format the code base from time to time. To install **rustfmt-nightly**, simply run `cargo install rustfmt-nightly --force`. diff --git a/rustfmt.toml b/rustfmt.toml index 7bbf6f6e1dc9738a86b897c8e353f4e758a96f2d..1f9ec585512bcee8606712217397d3e4f43bcda9 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,3 +1,4 @@ +unstable_features = true array_horizontal_layout_threshold = 100 array_width = 100 attributes_on_same_line_as_field = false @@ -6,7 +7,7 @@ chain_one_line_max = 100 chain_width = 100 comment_width = 100 condense_wildcard_suffixes = true -error_on_line_overflow = false +error_on_line_overflow_comments = false fn_call_width = 100 fn_single_line = true format_strings = true @@ -22,4 +23,4 @@ struct_field_align_threshold = 30 struct_lit_width = 100 where_style = "legacy" wrap_comments = true -write_mode = "overwrite" \ No newline at end of file +write_mode = "overwrite"