From: Seiichi Uchida Date: Fri, 2 Mar 2018 12:53:24 +0000 (+0900) Subject: Do not reorder inline modules X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=0bd77f2681540123dcfc22590358a6619431022c;p=rust.git Do not reorder inline modules --- diff --git a/src/reorder.rs b/src/reorder.rs index d4bc36fc83f..a43f56d595b 100644 --- a/src/reorder.rs +++ b/src/reorder.rs @@ -23,7 +23,7 @@ use codemap::LineRangeUtils; use comment::combine_strs_with_missing_comments; use imports::{path_to_imported_ident, rewrite_import}; -use items::{rewrite_extern_crate, rewrite_mod}; +use items::{is_mod_decl, rewrite_extern_crate, rewrite_mod}; use lists::{itemize_list, write_list, ListFormatting}; use rewrite::{Rewrite, RewriteContext}; use shape::Shape; @@ -234,7 +234,7 @@ pub fn from(item: &ast::Item) -> Self { match item.node { _ if contains_macro_use_attr(item) => ReorderableItemKind::Other, ast::ItemKind::ExternCrate(..) => ReorderableItemKind::ExternCrate, - ast::ItemKind::Mod(..) => ReorderableItemKind::Mod, + ast::ItemKind::Mod(..) if is_mod_decl(item) => ReorderableItemKind::Mod, ast::ItemKind::Use(..) => ReorderableItemKind::Use, _ => ReorderableItemKind::Other, }