---

yaml
---
r: 150591
b: refs/heads/try2
c: 6d43138
h: refs/heads/master
i:
  150589: 325d3a5
  150587: 373963e
  150583: 79014ea
  150575: 96f8a3d
  150559: cfcacd0
  150527: 8531317
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: bf1ffaf5f48f925bfb62f9dca3bc73cfcc246148
+refs/heads/try2: 6d43138b75f009bfa6f0774953ef55fd91e9760a
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/print/pprust.rs

@@ -915,9 +915,6 @@ impl<'a> State<'a> {
             match attr.node.style {
                 ast::AttrInner => {
                     try!(self.print_attribute(attr));
-                    if !attr.node.is_sugared_doc {
-                        try!(word(&mut self.s, ";"));
-                    }
                     count += 1;
                 }
                 _ => {/* fallthrough */ }
@@ -935,7 +932,10 @@ impl<'a> State<'a> {
         if attr.node.is_sugared_doc {
             word(&mut self.s, attr.value_str().unwrap().get())
         } else {
-            try!(word(&mut self.s, "#["));
+            match attr.node.style {
+                ast::AttrInner => try!(word(&mut self.s, "#![")),
+                ast::AttrOuter => try!(word(&mut self.s, "#[")),
+            }
             try!(self.print_meta_item(attr.meta()));
             word(&mut self.s, "]")
         }

branches/try2/src/test/auxiliary/impl_privacy_xc_1.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[crate_type = "lib"];
+#![crate_type = "lib"]
 
 pub struct Fish {
     pub x: int

branches/try2/src/test/pretty/attr-fn-inner.rs

@@ -14,7 +14,7 @@
 // accidentally carried over to each inner function
 
 fn main() {
-    #[inner_attr];
+    #![inner_attr]
     #[outer_attr]
     fn f() { }
 

branches/try2/src/test/pretty/doc-comments.rs

@@ -57,5 +57,5 @@ fn f() { }
 fn g() { }
 
 fn h() {
-    #[doc = "as do inner ones"];
+    #![doc = "as do inner ones"]
 }

branches/try2/src/test/run-pass/method-attributes.rs

@@ -22,12 +22,12 @@ trait frobable {
 impl frobable for int {
     #[frob_attr1]
     fn frob(&self) {
-        #[frob_attr2];
+        #![frob_attr2]
     }
 
     #[defrob_attr1]
     fn defrob(&self) {
-        #[defrob_attr2];
+        #![defrob_attr2]
     }
 }