diff options
| author | bors <bors@rust-lang.org> | 2017-02-09 11:42:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-09 11:42:49 +0000 |
| commit | 1129ce51a6cc83ea7d7283fce194948feef4e319 (patch) | |
| tree | adb445abe019bffb256aa6eafcbbe72340f75789 /src/libsyntax | |
| parent | b0e46f03d8f3ffe24b1bd1ae857ed86f95b1b3c2 (diff) | |
| parent | f8b6108deba112dcbff621635e00d5800cb425d3 (diff) | |
| download | rust-1129ce51a6cc83ea7d7283fce194948feef4e319.tar.gz rust-1129ce51a6cc83ea7d7283fce194948feef4e319.zip | |
Auto merge of #39265 - est31:master, r=petrochenkov
Stabilize static lifetime in statics Stabilize the "static_in_const" feature. Blockers before this PR can be merged: * [x] The [FCP with inclination to stabilize](https://github.com/rust-lang/rust/issues/35897#issuecomment-270441437) needs to be over. FCP lasts roughly three weeks, so will be over at Jan 25, aka this thursday. * [x] Documentation needs to be added (#37928) Closes #35897.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index cc0a67b3d2e..a7c86bf8e06 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -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), @@ -386,6 +383,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) |