Use trim_tries to extract post comment over simple trim_matches

[rust.git] / src / reorder.rs

diff --git a/src/reorder.rs b/src/reorder.rs
index 343bbb497bd638929e2d9be8e637b5a8fd9a08a4..b6876738cfd6a2236bf8c3cab8a45f98979df1d1 100644 (file)
--- a/src/reorder.rs
+++ b/src/reorder.rs
@@ -14,19 +14,19 @@
 //! order. Trait items are reordered in pre-determined order (associated types
 //! and constants comes before methods).
 
-// TODO(#2455): Reorder trait items.
+// FIXME(#2455): Reorder trait items.
 
-use config::{lists::*, Config};
-use syntax::{ast, attr, codemap::Span};
+use config::Config;
+use syntax::{ast, attr, source_map::Span};
 
 use attr::filter_inline_attrs;
-use codemap::LineRangeUtils;
 use comment::combine_strs_with_missing_comments;
 use imports::{merge_use_trees, UseTree};
 use items::{is_mod_decl, rewrite_extern_crate, rewrite_mod};
 use lists::{itemize_list, write_list, ListFormatting, ListItem};
 use rewrite::{Rewrite, RewriteContext};
 use shape::Shape;
+use source_map::LineRangeUtils;
 use spanned::Spanned;
 use utils::mk_sp;
 use visitor::FmtVisitor;
@@ -69,17 +69,7 @@ fn wrap_reorderable_items(
     list_items: &[ListItem],
     shape: Shape,
 ) -> Option<String> {
-    let fmt = ListFormatting {
-        tactic: DefinitiveListTactic::Vertical,
-        separator: "",
-        trailing_separator: SeparatorTactic::Never,
-        separator_place: SeparatorPlace::Back,
-        shape,
-        ends_with_newline: true,
-        preserve_newline: false,
-        config: context.config,
-    };
-
+    let fmt = ListFormatting::new(shape, context.config).separator("");
     write_list(list_items, &fmt)
 }
 
@@ -99,7 +89,7 @@ fn rewrite_reorderable_item(
 
     let item_str = match item.node {
         ast::ItemKind::ExternCrate(..) => rewrite_extern_crate(context, item)?,
-        ast::ItemKind::Mod(..) => rewrite_mod(item),
+        ast::ItemKind::Mod(..) => rewrite_mod(context, item),
         _ => return None,
     };
 
@@ -150,8 +140,7 @@ fn rewrite_reorderable_items(
                 .map(|use_tree| ListItem {
                     item: use_tree.rewrite_top_level(context, nested_shape),
                     ..use_tree.list_item.unwrap_or_else(ListItem::empty)
-                })
-                .collect();
+                }).collect();
 
             wrap_reorderable_items(context, &item_vec, nested_shape)
         }
@@ -237,18 +226,18 @@ fn walk_reorderable_items(
         item_kind: ReorderableItemKind,
         in_group: bool,
     ) -> usize {
-        let mut last = self.codemap.lookup_line_range(items[0].span());
+        let mut last = self.source_map.lookup_line_range(items[0].span());
         let item_length = items
             .iter()
             .take_while(|ppi| {
-                item_kind.is_same_item_kind(&***ppi) && (!in_group || {
-                    let current = self.codemap.lookup_line_range(ppi.span());
-                    let in_same_group = current.lo < last.hi + 2;
-                    last = current;
-                    in_same_group
-                })
-            })
-            .count();
+                item_kind.is_same_item_kind(&***ppi)
+                    && (!in_group || {
+                        let current = self.source_map.lookup_line_range(ppi.span());
+                        let in_same_group = current.lo < last.hi + 2;
+                        last = current;
+                        in_same_group
+                    })
+            }).count();
         let items = &items[..item_length];
 
         let at_least_one_in_file_lines = items