about summary refs log tree commit diff
path: root/src/test/run-pass
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-02-09 11:42:49 +0000
committerbors <bors@rust-lang.org>2017-02-09 11:42:49 +0000
commit1129ce51a6cc83ea7d7283fce194948feef4e319 (patch)
treeadb445abe019bffb256aa6eafcbbe72340f75789 /src/test/run-pass
parentb0e46f03d8f3ffe24b1bd1ae857ed86f95b1b3c2 (diff)
parentf8b6108deba112dcbff621635e00d5800cb425d3 (diff)
downloadrust-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/test/run-pass')
-rw-r--r--src/test/run-pass/rfc1623.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/test/run-pass/rfc1623.rs b/src/test/run-pass/rfc1623.rs
index fc9143dc450..17453933c8a 100644
--- 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