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/test/incremental | |
| 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/test/incremental')
| -rw-r--r-- | src/test/incremental/change_add_field/struct_point.rs | 1 | ||||
| -rw-r--r-- | src/test/incremental/change_pub_inherent_method_sig/struct_point.rs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/test/incremental/change_add_field/struct_point.rs b/src/test/incremental/change_add_field/struct_point.rs index e18b30a8c72..ac5c0d3b9e7 100644 --- 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 f8db6c69a76..4d12b7b390c 100644 --- 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. |