From c195783c05d253c8e32fb781cce1ae978f8bd6bd Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Mon, 2 Mar 2015 21:46:31 +1100 Subject: Feature gate `#[static_assert]`. The API this exposes is a little strange (being attached to `static`s), so it makes sense to conservatively feature gate it. If it is highly popular, it is possible to reverse this gating. --- src/test/compile-fail/asm-misplaced-option.rs | 9 +++------ src/test/compile-fail/feature-gate-static-assert.rs | 14 ++++++++++++++ src/test/compile-fail/issue-6804.rs | 8 +++----- src/test/compile-fail/nonbool_static_assert.rs | 1 + src/test/compile-fail/static-assert.rs | 1 + src/test/compile-fail/static-assert2.rs | 1 + src/test/run-pass/static-assert.rs | 2 ++ 7 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 src/test/compile-fail/feature-gate-static-assert.rs (limited to 'src/test') diff --git a/src/test/compile-fail/asm-misplaced-option.rs b/src/test/compile-fail/asm-misplaced-option.rs index 02d06c4e1bf..43a0ad6b5f6 100644 --- a/src/test/compile-fail/asm-misplaced-option.rs +++ b/src/test/compile-fail/asm-misplaced-option.rs @@ -10,13 +10,14 @@ // ignore-android -#![feature(asm)] +#![feature(asm, rustc_attrs)] #![allow(dead_code, non_upper_case_globals)] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] -pub fn main() { +#[rustc_error] +pub fn main() { //~ ERROR compilation successful // assignment not dead let mut x: isize = 0; unsafe { @@ -33,7 +34,3 @@ pub fn main() { } assert_eq!(x, 13); } - -// At least one error is needed so that compilation fails -#[static_assert] -static b: bool = false; //~ ERROR static assertion failed diff --git a/src/test/compile-fail/feature-gate-static-assert.rs b/src/test/compile-fail/feature-gate-static-assert.rs new file mode 100644 index 00000000000..25740397d7a --- /dev/null +++ b/src/test/compile-fail/feature-gate-static-assert.rs @@ -0,0 +1,14 @@ +// 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_assert] //~ ERROR `#[static_assert]` is an experimental feature +static X: bool = true; + +fn main() {} diff --git a/src/test/compile-fail/issue-6804.rs b/src/test/compile-fail/issue-6804.rs index 30d3ab17a46..08c5cae9f5f 100644 --- a/src/test/compile-fail/issue-6804.rs +++ b/src/test/compile-fail/issue-6804.rs @@ -8,13 +8,15 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +#![feature(rustc_attrs)] #![allow(dead_code)] // Matching against NaN should result in a warning use std::f64::NAN; -fn main() { +#[rustc_error] +fn main() { //~ ERROR compilation successful let x = NAN; match x { NAN => {}, @@ -27,7 +29,3 @@ fn main() { }; //~^^^ WARNING unmatchable NaN in pattern, use the is_nan method in a guard instead } - -// At least one error is needed so that compilation fails -#[static_assert] -static B: bool = false; //~ ERROR static assertion failed diff --git a/src/test/compile-fail/nonbool_static_assert.rs b/src/test/compile-fail/nonbool_static_assert.rs index d85f58edc90..7a7912b06f8 100644 --- a/src/test/compile-fail/nonbool_static_assert.rs +++ b/src/test/compile-fail/nonbool_static_assert.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +#![feature(static_assert)] #![allow(dead_code)] #[static_assert] diff --git a/src/test/compile-fail/static-assert.rs b/src/test/compile-fail/static-assert.rs index 349e5f4cb51..d0cfbfbbccc 100644 --- a/src/test/compile-fail/static-assert.rs +++ b/src/test/compile-fail/static-assert.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +#![feature(static_assert)] #![allow(dead_code)] #[static_assert] diff --git a/src/test/compile-fail/static-assert2.rs b/src/test/compile-fail/static-assert2.rs index d5e70205e95..35f840dab0c 100644 --- a/src/test/compile-fail/static-assert2.rs +++ b/src/test/compile-fail/static-assert2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +#![feature(static_assert)] #![allow(dead_code)] #[static_assert] diff --git a/src/test/run-pass/static-assert.rs b/src/test/run-pass/static-assert.rs index f8fd81b9365..f650e56bb6b 100644 --- a/src/test/run-pass/static-assert.rs +++ b/src/test/run-pass/static-assert.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +#![feature(static_assert)] + #[static_assert] static b: bool = true; -- cgit 1.4.1-3-g733a5