Auto merge of #1175 - nox:rustfmt, r=emilio

bors-servo · web-flow · commit a48ca25600fd · 2017-12-04T05:00:09.000-06:00
Remove unstable rustfmt-nightly features
diff --git 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
@@ -1 +1 @@
-error_on_line_overflow_comments = false
+# Intentionally left blank.

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-error_on_line_overflow_comments = false`
	`1`	`+# Intentionally left blank.`