about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-03-27 14:10:39 -0700
committerbors <bors@rust-lang.org>2016-03-27 14:10:39 -0700
commite1080dca01affec0e9633ca79e7bafff52578ac9 (patch)
tree96f861c2c144f579998cf0feb292f15aea6eff8f /src/libsyntax
parentdeee0f73da885a71ebf9c8d29213c663dba467b9 (diff)
parent7b69ad91585cebb50a1b6cae0d8d9a3ac83d78ff (diff)
downloadrust-e1080dca01affec0e9633ca79e7bafff52578ac9.tar.gz
rust-e1080dca01affec0e9633ca79e7bafff52578ac9.zip
Auto merge of #32516 - nodakai:fix-type-macro-feat-gate, r=alexcrichton
Type macro is tracked at rust-lang/rust#27245, not 27336
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index cd88aaa4597..5ade636a327 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -199,7 +199,7 @@ const KNOWN_FEATURES: &'static [(&'static str, &'static str, Option<u32>, Status
     ("associated_type_defaults", "1.2.0", Some(29661), Active),
 
     // Allows macros to appear in the type position.
-    ("type_macros", "1.3.0", Some(27336), Active),
+    ("type_macros", "1.3.0", Some(27245), Active),
 
     // allow `repr(simd)`, and importing the various simd intrinsics
     ("repr_simd", "1.4.0", Some(27731), Active),