Skip to content

Commit

Permalink
Stabilize static in const
Browse files Browse the repository at this point in the history
Closes #35897.
  • Loading branch information
est31 committed Feb 8, 2017
1 parent 10f6a5c commit f8b6108
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 34 deletions.
14 changes: 1 addition & 13 deletions src/librustc/middle/resolve_lifetime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>)
}
Expand Down Expand Up @@ -324,7 +322,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
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));
Expand Down Expand Up @@ -1307,16 +1305,6 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
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 {
Expand Down
5 changes: 2 additions & 3 deletions src/libsyntax/feature_gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,6 @@ 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)),

// Used to identify the `compiler_builtins` crate
// rustc internal
(active, compiler_builtins, "1.13.0", None),
Expand Down Expand Up @@ -382,6 +379,8 @@ declare_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)

Expand Down
14 changes: 0 additions & 14 deletions src/test/compile-fail/feature-gate-static-in-const.rs

This file was deleted.

1 change: 0 additions & 1 deletion src/test/compile-fail/rfc1623.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion src/test/incremental/change_add_field/struct_point.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

#![feature(rustc_attrs)]
#![feature(stmt_expr_attributes)]
#![feature(static_in_const)]
#![allow(dead_code)]

// These are expected to require translation.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

#![feature(rustc_attrs)]
#![feature(stmt_expr_attributes)]
#![feature(static_in_const)]
#![allow(dead_code)]

// These are expected to require translation.
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/rfc1623.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f8b6108

Please sign in to comment.