Move filter_inline_attrs() to attr mod from visitor mod

diff --git a/rustfmt-core/src/attr.rs b/rustfmt-core/src/attr.rs
index 75d98a729c6b14b71400079326ab5ce4f500bbb1..a16f0f5a8a96b9d589ab4f5ec8ebda3c12a0e7bd 100644 (file)
--- a/rustfmt-core/src/attr.rs
+++ b/rustfmt-core/src/attr.rs
@@ -12,6 +12,7 @@
 
 use config::lists::*;
 use syntax::ast;
+use syntax::codemap::Span;
 
 use comment::{combine_strs_with_missing_comments, contains_comment, rewrite_doc_comment};
 use expr::rewrite_literal;
@@ -32,6 +33,15 @@ pub fn get_attrs_from_stmt(stmt: &ast::Stmt) -> &[ast::Attribute] {
     }
 }
 
+/// Returns attributes that are within `outer_span`.
+pub fn filter_inline_attrs(attrs: &[ast::Attribute], outer_span: Span) -> Vec<ast::Attribute> {
+    attrs
+        .iter()
+        .filter(|a| outer_span.lo() <= a.span.lo() && a.span.hi() <= outer_span.hi())
+        .cloned()
+        .collect()
+}
+
 fn is_derive(attr: &ast::Attribute) -> bool {
     attr.check_name("derive")
 }

diff --git a/rustfmt-core/src/reorder.rs b/rustfmt-core/src/reorder.rs
index 51c081e6ba88ee3c5f53339415d78b5bc1f121e1..82bf18f6b5e1e5d63b744d1da18747d631f297af 100644 (file)
--- a/rustfmt-core/src/reorder.rs
+++ b/rustfmt-core/src/reorder.rs
@@ -19,6 +19,7 @@
 use config::{Config, lists::*};
 use syntax::{ast, attr, codemap::Span};
 
+use attr::filter_inline_attrs;
 use codemap::LineRangeUtils;
 use comment::combine_strs_with_missing_comments;
 use imports::{path_to_imported_ident, rewrite_import};
@@ -28,7 +29,7 @@
 use shape::Shape;
 use spanned::Spanned;
 use utils::mk_sp;
-use visitor::{filter_inline_attrs, rewrite_extern_crate, FmtVisitor};
+use visitor::{rewrite_extern_crate, FmtVisitor};
 
 use std::cmp::Ordering;
 

diff --git a/rustfmt-core/src/visitor.rs b/rustfmt-core/src/visitor.rs
index 8a6fb3f169c65ed58040a3fd6098ce113cee6a95..4dd121c719fdc1e3e0a3fc9b5771b99db56dff70 100644 (file)
--- a/rustfmt-core/src/visitor.rs
+++ b/rustfmt-core/src/visitor.rs
@@ -26,15 +26,6 @@
 use spanned::Spanned;
 use utils::{self, contains_skip, count_newlines, inner_attributes, mk_sp, ptr_vec_to_ref_vec};
 
-/// Returns attributes that are within `outer_span`.
-pub fn filter_inline_attrs(attrs: &[ast::Attribute], outer_span: Span) -> Vec<ast::Attribute> {
-    attrs
-        .iter()
-        .filter(|a| outer_span.lo() <= a.span.lo() && a.span.hi() <= outer_span.hi())
-        .cloned()
-        .collect()
-}
-
 /// Returns true for `mod foo;`, false for `mod foo { .. }`.
 fn is_mod_decl(item: &ast::Item) -> bool {
     match item.node {