Rename reorder_imports_opinionated -> group_imports

Author: MattX

Configurations.md

@@ -2008,22 +2008,22 @@ use dolor;
 use sit;
 ```
 
-## `reorder_imports_opinionated`
+## `group_imports`
 
 Discard existing import groups, and create three groups for:
 1. `std`, `core` and `alloc`,
 2. external crates,
-3. this module.
+3. `self`, `super` and `crate` imports.
 
 Within each group, imports are sorted as with `reorder_imports`.
 
 This has no effect is `reorder_imports` is `false`.
 
-- **Default value**: `false`
-- **Possible values**: `true`, `false`
+- **Default value**: `None`
+- **Possible values**: `None`, `StdExternalCrate`
 - **Stable**: No
 
-#### `false` (default):
+#### `None` (default):
 
 ```rust
 use super::update::convert_publish_payload;
@@ -2042,7 +2042,7 @@ use crate::models::Event;
 use core::f32;
 ```
 
-#### `true`:
+#### `StdExternalCrate`:
 
 ```rust
 use alloc::alloc::Layout;

src/config.rs

@@ -78,11 +78,11 @@ create_config! {
     imports_indent: IndentStyle, IndentStyle::Block, false, "Indent of imports";
     imports_layout: ListTactic, ListTactic::Mixed, false, "Item layout inside a import block";
     merge_imports: bool, false, false, "Merge imports";
+    group_imports: GroupImportsTactic, GroupImportsTactic::None, false,
+        "Reorganize import groups";
 
     // Ordering
     reorder_imports: bool, true, true, "Reorder import and extern crate statements alphabetically";
-    reorder_imports_opinionated: bool, false, false,
-        "Create blocks for standard, external, and local imports";
     reorder_modules: bool, true, true, "Reorder module statements alphabetically in group";
     reorder_impl_items: bool, false, false, "Reorder impl items";
 
@@ -595,8 +595,8 @@ where_single_line = false
 imports_indent = "Block"
 imports_layout = "Mixed"
 merge_imports = false
+group_imports = "None"
 reorder_imports = true
-reorder_imports_opinionated = false
 reorder_modules = true
 reorder_impl_items = false
 type_punctuation_density = "Wide"

src/config/options.rs

@@ -106,6 +106,18 @@ impl Density {
     }
 }
 
+#[config_type]
+/// Configuration for import groups, i.e. sets of imports separated by newlines.
+pub enum GroupImportsTactic {
+    /// Keep groups as they are.
+    None,
+    /// Discard existing groups, and create new groups for
+    ///  1. `std` / `core` / `alloc` imports
+    ///  2. other imports
+    ///  3. `self` / `crate` / `super` imports
+    StdExternalCrate,
+}
+
 #[config_type]
 pub enum ReportTactic {
     Always,

src/formatting/reorder.rs

@@ -11,7 +11,7 @@ use std::cmp::{Ord, Ordering};
 use rustc_ast::ast;
 use rustc_span::{symbol::sym, Span};
 
-use crate::config::Config;
+use crate::config::{Config, GroupImportsTactic};
 use crate::formatting::imports::UseSegment;
 use crate::formatting::modules::{get_mod_inner_attrs, FileModMap};
 use crate::formatting::{
@@ -229,7 +229,7 @@ fn rewrite_reorderable_items(
                 normalized_items = merge_use_trees(normalized_items);
             }
 
-            let reordered_imports = if context.config.reorder_imports_opinionated() {
+            let reordered_imports = if context.config.group_imports() != GroupImportsTactic::None {
                 group_and_sort_imports(normalized_items)
             } else {
                 normalized_items.sort();
@@ -360,7 +360,7 @@ impl ReorderableItemKind {
     fn in_group(self, config: &Config) -> bool {
         match self {
             ReorderableItemKind::ExternCrate | ReorderableItemKind::Mod => true,
-            ReorderableItemKind::Use => !config.reorder_imports_opinionated(),
+            ReorderableItemKind::Use => config.group_imports() == GroupImportsTactic::None,
             ReorderableItemKind::Other => false,
         }
     }

tests/source/imports-reorder-opinionated.rs renamed to tests/source/group_imports.rs

@@ -1,4 +1,4 @@
-// rustfmt-reorder_imports_opinionated: true
+// rustfmt-group_imports: StdExternalCrate
 use chrono::Utc;
 use super::update::convert_publish_payload;
 

tests/target/imports-reorder-opinionated.rs renamed to tests/target/group_imports.rs

@@ -1,4 +1,4 @@
-// rustfmt-reorder_imports_opinionated: true
+// rustfmt-group_imports: StdExternalCrate
 use alloc::alloc::Layout;
 use core::f32;
 use std::sync::Arc;