about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-07-28 11:37:41 +0000
committerbors <bors@rust-lang.org>2018-07-28 11:37:41 +0000
commit5b465e309da475aaedcb742ef29094c82e970051 (patch)
tree2d8779c94b4e4158c88a82e008b1ed7ca8a2762e /src/libsyntax
parentcc224282de8de427005103e5c0504cbdf1148694 (diff)
parent130e3ab31b28c9839e2f04c98c4b62c6f1c215a3 (diff)
downloadrust-5b465e309da475aaedcb742ef29094c82e970051.tar.gz
rust-5b465e309da475aaedcb742ef29094c82e970051.zip
Auto merge of #52761 - toidiu:ak-static-infer-fg, r=nikomatsakis
static infer feature gate

https://github.com/rust-lang/rust/issues/44493

r? @nikomatsakis
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 30137439e77..087fec09719 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -396,6 +396,9 @@ declare_features! (
     // Infer outlives requirements; RFC 2093
     (active, infer_outlives_requirements, "1.26.0", Some(44493), None),
 
+    // Infer outlives requirements; RFC 2093
+    (active, infer_static_outlives_requirements, "1.26.0", Some(44493), None),
+
     // Multiple patterns with `|` in `if let` and `while let`
     (active, if_while_or_patterns, "1.26.0", Some(48215), None),
 
@@ -1057,6 +1060,12 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG
                                    "infer outlives requirements is an experimental feature",
                                    cfg_fn!(infer_outlives_requirements))),
 
+    // RFC #2093
+    ("infer_static_outlives_requirements", Normal, Gated(Stability::Unstable,
+                                   "infer_static_outlives_requirements",
+                                   "infer 'static lifetime requirements",
+                                   cfg_fn!(infer_static_outlives_requirements))),
+
     // RFC 2070
     ("panic_implementation", Normal, Gated(Stability::Unstable,
                            "panic_implementation",