Merge pull request #2682 from topecongiro/issue-2670

Do not duplicate attributes on use items

Author: nrc

src/imports.rs

@@ -35,7 +35,7 @@ pub fn path_to_imported_ident(path: &ast::Path) -> ast::Ident {
 
 impl<'a> FmtVisitor<'a> {
     pub fn format_import(&mut self, item: &ast::Item, tree: &ast::UseTree) {
-        let span = item.span;
+        let span = item.span();
         let shape = self.shape();
         let rw = UseTree::from_ast(
             &self.get_context(),

src/visitor.rs

@@ -303,6 +303,13 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
         let filtered_attrs;
         let mut attrs = &item.attrs;
         match item.node {
+            // For use items, skip rewriting attributes. Just check for a skip attribute.
+            ast::ItemKind::Use(..) => {
+                if contains_skip(attrs) {
+                    self.push_skipped_with_span(item.span());
+                    return;
+                }
+            }
             // Module is inline, in this case we treat it like any other item.
             _ if !is_mod_decl(item) => {
                 if self.visit_attrs(&item.attrs, ast::AttrStyle::Outer) {

tests/source/imports.rs

@@ -93,3 +93,7 @@ use a::{b::{c::{xxx, yyy, zzz}}};
 /// This line is not affected.
 // This line is deleted.
 use c;
+
+// #2670
+#[macro_use]
+use imports_with_attr;

tests/target/imports.rs

@@ -105,3 +105,7 @@ use a::b::c::{xxx, yyy, zzz};
 /// This line is not affected.
 // This line is deleted.
 use c;
+
+// #2670
+#[macro_use]
+use imports_with_attr;