---

yaml
---
r: 223211
b: refs/heads/auto
c: 2919e32
h: refs/heads/master
i:
  223209: d65b5a0
  223207: 2a84029
v: v3

Author: jroesch

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: f004079de22fa32cc3342bc770f415b9d395beb6
+refs/heads/auto: 2919e3268674f832883631a0476a2379768d55e8
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/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 \