Update rustfmt configuration with new options

Re-evaluate the configurations for rustfmt, make some changes and
reformat everything. The biggest change is how imports are formatted.

1 files changed, 26 insertions, 26 deletions

diff --git a/.rustfmt.toml b/.rustfmt.toml
index 1de37db..a8961e6 100644
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -1,61 +1,61 @@
-indent_style = "block"
-use_small_heuristics = "Default"
 binop_separator = "Front"
+blank_lines_lower_bound = 0
+blank_lines_upper_bound = 1
+brace_style = "SameLineWhere"
+color = "Auto"
 combine_control_expr = false
 comment_width = 120
 condense_wildcard_suffixes = true
 control_brace_style = "ClosingNextLine"
 disable_all_formatting = false
+empty_item_single_line = true
+enum_discrim_align_threshold = 0
 error_on_line_overflow = true
 error_on_unformatted = true
 fn_args_layout = "Tall"
-brace_style = "SameLineWhere"
-empty_item_single_line = true
-enum_discrim_align_threshold = 0
 fn_single_line = false
-where_single_line = true
 force_explicit_abi = true
-format_strings = true
-format_macro_matchers = false
+force_multiline_blocks = true
+format_code_in_doc_comments = true
 format_macro_bodies = true
+format_macro_matchers = false
+format_strings = true
 hard_tabs = true
+hide_parse_errors = false
 imports_indent = "Block"
 imports_layout = "HorizontalVertical"
-merge_imports = false
+imports_granularity = "Crate"
+indent_style = "block"
+inline_attribute_width = 0
+match_arm_blocks = true
+match_arm_leading_pipes = "Never"
 match_block_trailing_comma = true
 max_width = 120
 merge_derives = true
-force_multiline_blocks = true
 newline_style = "Unix"
-normalize_comments = true
+normalize_comments = false
+normalize_doc_attributes = true
+overflow_delimited_expr = true
 remove_nested_parens = true
+reorder_impl_items = true
 reorder_imports = true
+group_imports = "StdExternalCrate"
 reorder_modules = true
-reorder_impl_items = true
-report_todo = "Never"
 report_fixme = "Never"
+report_todo = "Never"
 skip_children = false
 space_after_colon = true
 space_before_colon = false
-struct_field_align_threshold = 0
 spaces_around_ranges = false
+struct_field_align_threshold = 0
 struct_lit_single_line = true
 tab_spaces = 4
 trailing_comma = "Vertical"
 trailing_semicolon = true
 type_punctuation_density = "Wide"
+unstable_features = true
 use_field_init_shorthand = true
+use_small_heuristics = "Default"
 use_try_shorthand = true
-format_code_in_doc_comments = true
+where_single_line = true
 wrap_comments = true
-match_arm_blocks = true
-overflow_delimited_expr = true
-blank_lines_upper_bound = 1
-blank_lines_lower_bound = 0
-# required_version
-hide_parse_errors = true
-color = "Auto"
-unstable_features = true
-# license_template_path = ""
-normalize_doc_attributes = true
-inline_attribute_width = 0