diff options
| author | bors <bors@rust-lang.org> | 2016-09-09 21:35:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-09 21:35:30 -0700 |
| commit | f508ddc5470e65243c4f6c79fc72e8b8534e71a6 (patch) | |
| tree | f35ca3c07625b270560b34acaf04d94f1e8b63aa /src/libsyntax | |
| parent | 1284081d33d0e7856c6d242b3e311876c4eec048 (diff) | |
| parent | 76a2f9f4542ccb15d6eb2426b162ce91094f04e2 (diff) | |
| download | rust-f508ddc5470e65243c4f6c79fc72e8b8534e71a6.tar.gz rust-f508ddc5470e65243c4f6c79fc72e8b8534e71a6.zip | |
Auto merge of #36332 - llogiq:static_consts_feature, r=nikomatsakis
add static_in_const feature gate also updates tests and deletes the spurious .bk files I inadvertently added last time. r? @nikomatsakis
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index dd2956f706c..8b8a41fc204 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -295,6 +295,9 @@ 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)), ); declare_features! ( |