@@ -12,7 +12,7 @@ use rustc_ast::ast;
1212use rustc_span:: { symbol:: sym, Span } ;
1313
1414use crate :: config:: { Config , GroupImportsTactic , ImportGranularity } ;
15- use crate :: imports:: { merge_use_trees, SharedPrefix , UseSegment , UseTree } ;
15+ use crate :: imports:: { flatten_use_trees , merge_use_trees, SharedPrefix , UseSegment , UseTree } ;
1616use crate :: items:: { is_mod_decl, rewrite_extern_crate, rewrite_mod} ;
1717use crate :: lists:: { itemize_list, write_list, ListFormatting , ListItem } ;
1818use crate :: rewrite:: RewriteContext ;
@@ -107,15 +107,14 @@ fn rewrite_reorderable_or_regroupable_items(
107107 for ( item, list_item) in normalized_items. iter_mut ( ) . zip ( list_items) {
108108 item. list_item = Some ( list_item. clone ( ) ) ;
109109 }
110- match context. config . imports_granularity ( ) {
111- ImportGranularity :: Crate => {
112- normalized_items = merge_use_trees ( normalized_items, SharedPrefix :: Crate )
113- }
110+ normalized_items = match context. config . imports_granularity ( ) {
111+ ImportGranularity :: Crate => merge_use_trees ( normalized_items, SharedPrefix :: Crate ) ,
114112 ImportGranularity :: Module => {
115- normalized_items = merge_use_trees ( normalized_items, SharedPrefix :: Module )
113+ merge_use_trees ( normalized_items, SharedPrefix :: Module )
116114 }
117- ImportGranularity :: Preserve => { }
118- }
115+ ImportGranularity :: Item => flatten_use_trees ( normalized_items) ,
116+ ImportGranularity :: Preserve => normalized_items,
117+ } ;
119118
120119 let mut regrouped_items = match context. config . group_imports ( ) {
121120 GroupImportsTactic :: Preserve => vec ! [ normalized_items] ,
0 commit comments