diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-12-04 05:00:09 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-04 05:00:09 -0600 |
| commit | a48ca25600fd37b2da3579147bfa8fbb6ac32dd2 (patch) | |
| tree | 66a2734430acd2f66f86e6d270c8b6374982b863 | |
| parent | 935a18e5222a25509d65e7b4bc7f5cdb8831ce08 (diff) | |
| parent | 72c3012e6e2243bfab5d0c3f045da1a378cf64a9 (diff) | |
Auto merge of #1175 - nox:rustfmt, r=emilio
Remove unstable rustfmt-nightly features
| -rw-r--r-- | rustfmt.toml | 4 | ||||
| -rw-r--r-- | tests/rustfmt.toml | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/rustfmt.toml b/rustfmt.toml index 96d4ae47..0a24dd73 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,10 +1,6 @@ max_width = 80 -format_strings = false fn_brace_style = "SameLineWhere" item_brace_style = "SameLineWhere" struct_lit_multiline_style = "ForceMulti" where_trailing_comma = true -reorder_imports = true -reorder_imported_names = true normalize_comments = false -write_mode = "Overwrite" diff --git a/tests/rustfmt.toml b/tests/rustfmt.toml index a9e57337..80a6663b 100644 --- a/tests/rustfmt.toml +++ b/tests/rustfmt.toml @@ -1 +1 @@ -error_on_line_overflow_comments = false +# Intentionally left blank. |