summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorAndre Bogus <bogusandre@gmail.com>2016-09-07 23:18:46 +0200
committerAndre Bogus <bogusandre@gmail.com>2016-09-07 23:18:46 +0200
commit41d1cd7196d6799fa960ac220d20b958c1b797ed (patch)
treef3dfd90ea9297b1e96c1a994e5046a9c5698be71 /src/libsyntax
parentcf0cdc452b3335eec4d0d5ec27e922763d9835bc (diff)
downloadrust-41d1cd7196d6799fa960ac220d20b958c1b797ed.tar.gz
rust-41d1cd7196d6799fa960ac220d20b958c1b797ed.zip
add static_in_const feature gate
also updates tests and deletes the spurious .bk files I inadvertently
added last time.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index dd2956f706c..8b8a41fc204 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -295,6 +295,9 @@ declare_features! (
 
     // Allows untagged unions `union U { ... }`
     (active, untagged_unions, "1.13.0", Some(32836)),
+
+    // elide `'static` lifetimes in `static`s and `const`s
+    (active, static_in_const, "1.13.0", Some(35897)),
 );
 
 declare_features! (