Stabilize static in const

Closes #35897.

diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs
index 158b406deb8a48c69323564cb2dee343a07cf2fa..9bad98dda83f83383725584e960187ebc4b43e4f 100644 (file)
--- a/src/librustc/middle/resolve_lifetime.rs
+++ b/src/librustc/middle/resolve_lifetime.rs
@@ -238,8 +238,6 @@ enum Elide {
     FreshLateAnon(Cell<u32>),
     /// Always use this one lifetime.
     Exact(Region),
-    /// Like `Exact(Static)` but requires `#![feature(static_in_const)]`.
-    Static,
     /// Less or more than one lifetime were found, error on unspecified.
     Error(Vec<ElisionFailureInfo>)
 }
@@ -324,7 +322,7 @@ fn visit_item(&mut self, item: &'tcx hir::Item) {
             hir::ItemConst(..) => {
                 // No lifetime parameters, but implied 'static.
                 let scope = Scope::Elision {
-                    elide: Elide::Static,
+                    elide: Elide::Exact(Region::Static),
                     s: ROOT_SCOPE
                 };
                 self.with(scope, |_, this| intravisit::walk_item(this, item));
@@ -1307,16 +1305,6 @@ fn resolve_elided_lifetimes(&mut self, lifetime_refs: &[hir::Lifetime]) {
                             return;
                         }
                         Elide::Exact(l) => l.shifted(late_depth),
-                        Elide::Static => {
-                            if !self.sess.features.borrow().static_in_const {
-                                self.sess
-                                    .struct_span_err(span,
-                                                     "this needs a `'static` lifetime or the \
-                                                      `static_in_const` feature, see #35897")
-                                    .emit();
-                            }
-                            Region::Static
-                        }
                         Elide::Error(ref e) => break Some(e)
                     };
                     for lifetime_ref in lifetime_refs {

diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index a78c192a120df22bd5496b48eaa44d5d03d718bb..77846b69829c8606d5e6d7b4e3f0cb2aa9a650a7 100644 (file)
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -281,9 +281,6 @@ pub fn new() -> 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)),
-
     // Used to identify the `compiler_builtins` crate
     // rustc internal
     (active, compiler_builtins, "1.13.0", None),
@@ -382,6 +379,8 @@ pub fn new() -> Features {
     (accepted, item_like_imports, "1.14.0", Some(35120)),
     // Allows using `Self` and associated types in struct expressions and patterns.
     (accepted, more_struct_aliases, "1.16.0", Some(37544)),
+    // elide `'static` lifetimes in `static`s and `const`s
+    (accepted, static_in_const, "1.17.0", Some(35897)),
 );
 // (changing above list without updating src/doc/reference.md makes @cmr sad)
 

diff --git a/src/test/compile-fail/feature-gate-static-in-const.rs b/src/test/compile-fail/feature-gate-static-in-const.rs
deleted file mode 100644 (file)
index c1fc7cd..0000000
--- a/src/test/compile-fail/feature-gate-static-in-const.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-static FOO: &str = "this will work once static_in_const is stable";
-//~^ ERROR: this needs a `'static` lifetime or the `static_in_const` feature
-
-fn main() {}

diff --git a/src/test/compile-fail/rfc1623.rs b/src/test/compile-fail/rfc1623.rs
index 93635e7fddea781c7b9f065c598abe20ee416f33..e8295e5e2da087efc972af75fc874a9fc5bf2641 100644 (file)
--- a/src/test/compile-fail/rfc1623.rs
+++ b/src/test/compile-fail/rfc1623.rs
@@ -7,7 +7,6 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-#![feature(static_in_const)]
 #![allow(dead_code)]
 
 fn non_elidable<'a, 'b>(a: &'a u8, b: &'b u8) -> &'a u8 {

diff --git a/src/test/incremental/change_add_field/struct_point.rs b/src/test/incremental/change_add_field/struct_point.rs
index e18b30a8c72428100e6f220f26cb2dfef54169ea..ac5c0d3b9e72d9c9487ecbcf81b87ba0114bd4a5 100644 (file)
--- a/src/test/incremental/change_add_field/struct_point.rs
+++ b/src/test/incremental/change_add_field/struct_point.rs
@@ -18,7 +18,6 @@
 
 #![feature(rustc_attrs)]
 #![feature(stmt_expr_attributes)]
-#![feature(static_in_const)]
 #![allow(dead_code)]
 
 // These are expected to require translation.

diff --git a/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs b/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs
index f8db6c69a76f9f0cf90cac88df35c3650bb4783c..4d12b7b390cc91d13e428f6f3156a4e8888d5d41 100644 (file)
--- a/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs
+++ b/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs
@@ -15,7 +15,6 @@
 
 #![feature(rustc_attrs)]
 #![feature(stmt_expr_attributes)]
-#![feature(static_in_const)]
 #![allow(dead_code)]
 
 // These are expected to require translation.

diff --git a/src/test/run-pass/rfc1623.rs b/src/test/run-pass/rfc1623.rs
index fc9143dc450b76469a2a692c143b958ea7f09b50..17453933c8abcdc35b87ca4a20a409d8ec817b8d 100644 (file)
--- a/src/test/run-pass/rfc1623.rs
+++ b/src/test/run-pass/rfc1623.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(static_in_const)]
 #![allow(dead_code)]
 
 // very simple test for a 'static static with default lifetime