about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-10-09 02:57:38 +0000
committerbors <bors@rust-lang.org>2015-10-09 02:57:38 +0000
commit9f37fbc7433f74ecb4ab11451a2311cc93b9ed88 (patch)
tree51370ee816cd23eb08fc62f660f787feaae296ed /src/libsyntax
parent0f536431f54efe572a2be0c7c082e79c2fe62f4a (diff)
parenteacf78d8d47b44fb9f1be06407b036b8268bc513 (diff)
downloadrust-9f37fbc7433f74ecb4ab11451a2311cc93b9ed88.tar.gz
rust-9f37fbc7433f74ecb4ab11451a2311cc93b9ed88.zip
Auto merge of #28919 - huonw:placement-tracking-issue, r=alexcrichton
cc #28244
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 39b1b746de8..6129cddfe6d 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -81,8 +81,8 @@ const KNOWN_FEATURES: &'static [(&'static str, &'static str, Option<u32>, Status
     ("associated_types", "1.0.0", None, Accepted),
     ("visible_private_types", "1.0.0", None, Active),
     ("slicing_syntax", "1.0.0", None, Accepted),
-    ("box_syntax", "1.0.0", None, Active),
-    ("placement_in_syntax", "1.0.0", None, Active),
+    ("box_syntax", "1.0.0", Some(27779), Active),
+    ("placement_in_syntax", "1.0.0", Some(27779), Active),
     ("pushpop_unsafe", "1.2.0", None, Active),
     ("on_unimplemented", "1.0.0", None, Active),
     ("simd_ffi", "1.0.0", None, Active),