Skip to content

Commit

Permalink
Rollup merge of rust-lang#40279 - gibfahn:test-unwind, r=est31
Browse files Browse the repository at this point in the history
Add compile-fail tests for remaining items in whitelist and remove it

Add compile-fail tests for `cfg_target_thread_local` and `unwind_attributes`, and remove the whitelist.

Let me know if I should clean up the tests (or if I've done anything else wrong, this is my first contribution to rust).

cc/ @est31
  • Loading branch information
Ariel Ben-Yehuda authored Mar 8, 2017
2 parents 4eb7a33 + 7c88d9e commit 006c744
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 6 deletions.
17 changes: 17 additions & 0 deletions src/test/compile-fail/auxiliary/cfg-target-thread-local.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2016 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 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(thread_local)]
#![feature(cfg_target_thread_local)]
#![crate_type = "lib"]

#[no_mangle]
#[cfg_attr(target_thread_local, thread_local)]
pub static FOO: u32 = 3;
27 changes: 27 additions & 0 deletions src/test/compile-fail/feature-gate-cfg-target-thread-local.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright 2016 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 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// ignore-windows
// aux-build:cfg-target-thread-local.rs

#![feature(thread_local)]

extern crate cfg_target_thread_local;

extern {
#[cfg_attr(target_thread_local, thread_local)]
//~^ `cfg(target_thread_local)` is experimental and subject to change (see issue #29594)

static FOO: u32;
}

fn main() {
assert_eq!(FOO, 3);
}
28 changes: 28 additions & 0 deletions src/test/compile-fail/feature-gate-unwind-attributes.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// 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 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// compile-flags: -C no-prepopulate-passes

#![crate_type = "lib"]

extern {
// CHECK: Function Attrs: nounwind
// CHECK-NEXT: declare void @extern_fn
fn extern_fn();
// CHECK-NOT: Function Attrs: nounwind
// CHECK: declare void @unwinding_extern_fn
#[unwind] //~ ERROR #[unwind] is experimental
fn unwinding_extern_fn();
}

pub unsafe fn force_declare() {
extern_fn();
unwinding_extern_fn();
}
6 changes: 0 additions & 6 deletions src/tools/tidy/src/features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,17 +165,11 @@ pub fn check(path: &Path, bad: &mut bool) {
}
});

// FIXME get this whitelist empty.
let whitelist = vec![
"cfg_target_thread_local", "unwind_attributes",
];

// Only check the number of lang features.
// Obligatory testing for library features is dumb.
let gate_untested = features.iter()
.filter(|&(_, f)| f.level == Status::Unstable)
.filter(|&(_, f)| !f.has_gate_test)
.filter(|&(n, _)| !whitelist.contains(&n.as_str()))
.collect::<Vec<_>>();

for &(name, _) in gate_untested.iter() {
Expand Down

0 comments on commit 006c744

Please sign in to comment.