Add additional nightly rustfmt options
# stable options
-use_small_heuristics = "Default"
+edition = "2018"
force_explicit_abi = true
hard_tabs = false
max_width = 100
@@ -10,15 +10,46 @@ reorder_imports = true
reorder_modules = true
tab_spaces = 4
use_field_init_shorthand = true
+use_small_heuristics = "Default"
use_try_shorthand = true
-edition = "2018"
-# unstable options (for one-off fixes and CI)
-merge_imports = true
-wrap_comments = true
+# unstable options
+binop_separator = "Front"
+blank_lines_lower_bound = 0
+blank_lines_upper_bound = 1
+brace_style = "SameLineWhere"
+combine_control_expr = true
comment_width = 100
condense_wildcard_suffixes = true
+control_brace_style = "AlwaysSameLine"
+empty_item_single_line = true
+enum_discrim_align_threshold = 50
+fn_args_density = "Tall"
+fn_single_line = true
+force_multiline_blocks = false
+format_doc_comments = true
+format_macro_bodies = true
+format_macro_matchers = true
format_strings = true
+imports_indent = "Visual"
+imports_layout = "Vertical"
+indent_style = "Block"
+match_arm_blocks = true
+match_block_trailing_comma = false
+merge_imports = true
normalize_comments = true
+normalize_doc_attributes = true
+overflow_delimited_expr = false
reorder_impl_items = true
-format_doc_comments = true
+report_fixme = "Never"
+report_todo = "Never"
+space_after_colon = true
+space_before_colon = false
+spaces_around_ranges = false
+struct_field_align_threshold = 0
+struct_lit_single_line = true
+trailing_comma = "Vertical"
+trailing_semicolon = true
+type_punctuation_density = "Wide"
+where_single_line = false
+wrap_comments = true
