From f8b6108deba112dcbff621635e00d5800cb425d3 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 5 Feb 2017 18:14:14 +0100 Subject: Stabilize static in const Closes #35897. --- src/test/compile-fail/feature-gate-static-in-const.rs | 14 -------------- src/test/compile-fail/rfc1623.rs | 1 - src/test/incremental/change_add_field/struct_point.rs | 1 - .../change_pub_inherent_method_sig/struct_point.rs | 1 - src/test/run-pass/rfc1623.rs | 1 - 5 files changed, 18 deletions(-) delete mode 100644 src/test/compile-fail/feature-gate-static-in-const.rs (limited to 'src/test') diff --git a/src/test/compile-fail/feature-gate-static-in-const.rs b/src/test/compile-fail/feature-gate-static-in-const.rs deleted file mode 100644 index c1fc7cdd06c..00000000000 --- a/src/test/compile-fail/feature-gate-static-in-const.rs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2015 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -static FOO: &str = "this will work once static_in_const is stable"; -//~^ ERROR: this needs a `'static` lifetime or the `static_in_const` feature - -fn main() {} diff --git a/src/test/compile-fail/rfc1623.rs b/src/test/compile-fail/rfc1623.rs index 93635e7fdde..e8295e5e2da 100644 --- a/src/test/compile-fail/rfc1623.rs +++ b/src/test/compile-fail/rfc1623.rs @@ -7,7 +7,6 @@ // , 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 { 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. 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 -- cgit 1.4.1-3-g733a5