diff options
| author | bors <bors@rust-lang.org> | 2018-09-12 11:27:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-12 11:27:48 +0000 |
| commit | 6810f5286b6b91daab06fc3dccb27d8c46f14349 (patch) | |
| tree | f576d065912988d1cf5e916750ea4a8a6e4b07fd /src/libsyntax | |
| parent | 8586ec6980462c99a8926646201b2444d8938d29 (diff) | |
| parent | 731f4efae5ee18082202f31e8699fe07eb0a5d19 (diff) | |
| download | rust-6810f5286b6b91daab06fc3dccb27d8c46f14349.tar.gz rust-6810f5286b6b91daab06fc3dccb27d8c46f14349.zip | |
Auto merge of #53793 - toidiu:ak-stabalize, r=nikomatsakis
stabilize outlives requirements https://github.com/rust-lang/rust/issues/44493 r? @nikomatsakis
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 11 | ||||
| -rw-r--r-- | src/libsyntax/lib.rs | 1 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 2b4daa6440c..d98e4574399 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -412,9 +412,6 @@ declare_features! ( // Use `?` as the Kleene "at most one" operator (active, macro_at_most_once_rep, "1.25.0", Some(48075), None), - // Infer outlives requirements; RFC 2093 - (active, infer_outlives_requirements, "1.26.0", Some(44493), None), - // Infer static outlives requirements; RFC 2093 (active, infer_static_outlives_requirements, "1.26.0", Some(44493), None), @@ -672,6 +669,8 @@ declare_features! ( (accepted, proc_macro_path_invoc, "1.30.0", Some(38356), None), // Allows all literals in attribute lists and values of key-value pairs. (accepted, attr_literals, "1.30.0", Some(34981), None), + // Infer outlives requirements; RFC 2093 + (accepted, infer_outlives_requirements, "1.30.0", Some(44493), None), (accepted, panic_handler, "1.30.0", Some(44489), None), // Used to preserve symbols (see llvm.used) (accepted, used, "1.30.0", Some(40289), None), @@ -1125,12 +1124,6 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG cfg_fn!(rustc_attrs))), // RFC #2093 - ("infer_outlives_requirements", Normal, Gated(Stability::Unstable, - "infer_outlives_requirements", - "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", diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index c8ec273a03f..2aaab6aaa16 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -22,7 +22,6 @@ #![feature(crate_visibility_modifier)] #![feature(macro_at_most_once_rep)] #![cfg_attr(not(stage0), feature(nll))] -#![cfg_attr(not(stage0), feature(infer_outlives_requirements))] #![feature(rustc_attrs)] #![feature(rustc_diagnostic_macros)] #![feature(slice_sort_by_cached_key)] |