about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorAaron Turon <aturon@mozilla.com>2016-03-08 16:09:39 -0800
committerAaron Turon <aturon@mozilla.com>2016-03-14 15:05:14 -0700
commit35437c7cf6182b64b53d079367d8ca9822db9a33 (patch)
treee1f2227c6dfee3baa697316f10dce710a25a90aa /src/libsyntax
parent8f0e73ef55f6cf837555a0c144c00844eefa97b9 (diff)
downloadrust-35437c7cf6182b64b53d079367d8ca9822db9a33.tar.gz
rust-35437c7cf6182b64b53d079367d8ca9822db9a33.zip
Fixes after a rebase
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index a5f0fbbd094..fbaf28332c4 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -247,11 +247,10 @@ const KNOWN_FEATURES: &'static [(&'static str, &'static str, Option<u32>, Status
     ("inclusive_range_syntax", "1.7.0", Some(28237), Active),
 
     // `expr?`
-    ("question_mark", "1.9.0", Some(31436), Active)
+    ("question_mark", "1.9.0", Some(31436), Active),
 
     // impl specialization (RFC 1210)
-    // TODO: update with issue number (once it exists), before landing
-    ("specialization", "1.7.0", None, Active),
+    ("specialization", "1.7.0", Some(31844), Active),
 ];
 // (changing above list without updating src/doc/reference.md makes @cmr sad)