---

yaml
---
r: 222990
b: refs/heads/master
c: 2919e32
h: refs/heads/master
v: v3

Author: jroesch

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f004079de22fa32cc3342bc770f415b9d395beb6
+refs/heads/master: 2919e3268674f832883631a0476a2379768d55e8
 refs/heads/snap-stage3: a5c12f4e39d32af3c951b66bd2839bc0b5a1125b
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/libsyntax/feature_gate.rs

@@ -169,7 +169,8 @@ const KNOWN_FEATURES: &'static [(&'static str, &'static str, Status)] = &[
 
     // Allows associated type defaults
     ("associated_type_defaults", "1.2.0", Active),
-// Allows macros to appear in the type position.
+    // Allows macros to appear in the type position.
+
     ("type_macros", "1.3.0", Active),
 ];
 // (changing above list without updating src/doc/reference.md makes @cmr sad)
@@ -230,7 +231,8 @@ pub const KNOWN_ATTRIBUTES: &'static [(&'static str, AttributeType)] = &[
                      "no_std is experimental")),
     ("lang", Gated("lang_items",
                      "language items are subject to change")),
-    ("linkage", Gated("linkage", "the `linkage` attribute is experimental \
+    ("linkage", Gated("linkage",
+                      "the `linkage` attribute is experimental \
                        and not portable across platforms")),
     ("thread_local", Gated("thread_local",
                             "`#[thread_local]` is an experimental feature, and does not \