about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorSantiago Pastorino <spastorino@gmail.com>2017-12-19 15:10:07 -0300
committerNiko Matsakis <niko@alum.mit.edu>2017-12-20 14:38:12 -0500
commit0b2db1e6163cb9860a9ec83254d30eac1c9b90e7 (patch)
treee8fe7c32c2785a429485d9e3cbc4d7848266a394 /src/libsyntax
parent95b6148e31ff6482491dc955b09a5645780f0ea7 (diff)
Add nll feature and make nll imply nll_dump_cause
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index ba534676324..379881302ee 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -186,6 +186,9 @@ declare_features! (
     // Allows the use of rustc_* attributes; RFC 572
     (active, rustc_attrs, "1.0.0", Some(29642)),
 
+    // Allows the use of non lexical lifetimes; RFC 2094
+    (active, nll, "1.0.0", Some(44928)),
+
     // Allows the use of #[allow_internal_unstable]. This is an
     // attribute on macro_rules! and can't use the attribute handling
     // below (it has to be checked before expansion possibly makes
@@ -798,6 +801,12 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG
                                                           libcore functions that are inlined \
                                                           across crates and will never be stable",
                                                           cfg_fn!(rustc_attrs))),
+
+    // RFC #2094
+    ("nll", Whitelisted, Gated(Stability::Unstable,
+                               "nll",
+                               "Non lexical lifetimes",
+                               cfg_fn!(nll))),
     ("compiler_builtins", Whitelisted, Gated(Stability::Unstable,
                                              "compiler_builtins",
                                              "the `#[compiler_builtins]` attribute is used to \