Skip to content

Commit c95c946

Browse files
committed
ICE
This commit will cause rustc to ICE.
1 parent 7025979 commit c95c946

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/reorder.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use syntax::{ast, attr, codemap::Span};
2222
use attr::filter_inline_attrs;
2323
use codemap::LineRangeUtils;
2424
use comment::combine_strs_with_missing_comments;
25-
use imports::UseTree;
25+
use imports::{merge_use_trees, UseTree};
2626
use items::{is_mod_decl, rewrite_extern_crate, rewrite_mod};
2727
use lists::{itemize_list, write_list, ListFormatting, ListItem};
2828
use rewrite::{Rewrite, RewriteContext};
@@ -121,12 +121,13 @@ fn rewrite_reorderable_items(
121121
.iter()
122122
.filter_map(|item| UseTree::from_ast_with_normalization(context, item))
123123
.collect();
124+
let merged_items = merge_use_trees(normalized_items);
124125

125126
// 4 = "use ", 1 = ";"
126127
let nested_shape = shape.offset_left(4)?.sub_width(1)?;
127128
let list_items = itemize_list(
128129
context.snippet_provider,
129-
normalized_items.iter(),
130+
merged_items.iter(),
130131
"",
131132
";",
132133
|item| item.span.lo(),
@@ -137,7 +138,7 @@ fn rewrite_reorderable_items(
137138
false,
138139
);
139140

140-
let mut item_pair_vec: Vec<_> = list_items.zip(&normalized_items).collect();
141+
let mut item_pair_vec: Vec<_> = list_items.zip(&merged_items).collect();
141142
item_pair_vec.sort_by(|a, b| a.1.cmp(b.1));
142143
let item_vec: Vec<_> = item_pair_vec.into_iter().map(|pair| pair.0).collect();
143144

0 commit comments

Comments
 (0)