Merge pull request #1888 from topecongiro/no-panic-against-invalid-attr

Do not panic against files with invalid attributes

Author: nrc

src/visitor.rs

@@ -684,18 +684,13 @@ impl<'a> FmtVisitor<'a> {
             return false;
         }
 
-        let first = &attrs[0];
-        self.format_missing_with_indent(source!(self, first.span).lo);
-
-        let rewrite = attrs
-            .rewrite(
-                &self.get_context(),
-                Shape::indented(self.block_indent, self.config),
-            )
-            .unwrap();
-        self.buffer.push_str(&rewrite);
-        let last = attrs.last().unwrap();
-        self.last_pos = source!(self, last.span).hi;
+        let rewrite = attrs.rewrite(
+            &self.get_context(),
+            Shape::indented(self.block_indent, self.config),
+        );
+        let span = mk_sp(attrs[0].span.lo, attrs[attrs.len() - 1].span.hi);
+        self.push_rewrite(span, rewrite);
+
         false
     }
 

tests/source/attrib.rs

@@ -1,6 +1,9 @@
 // rustfmt-wrap_comments: true
 // Test attributes and doc comments are preserved.
 
+#[invalid attribute]
+fn foo() {}
+
 /// Blah blah blah.
 /// Blah blah blah.
 /// Blah blah blah.

tests/target/attrib.rs

@@ -1,6 +1,9 @@
 // rustfmt-wrap_comments: true
 // Test attributes and doc comments are preserved.
 
+#[invalid attribute]
+fn foo() {}
+
 /// Blah blah blah.
 /// Blah blah blah.
 /// Blah blah blah.