about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-02-28 08:33:02 -0500
committerGitHub <noreply@github.com>2017-02-28 08:33:02 -0500
commit922a262c43dd548daf129d86ae7e9cd29eb5efe1 (patch)
treeabc3e33a690a24b2696afdbaaf039cb6466f705a /src
parent5be0d9ff048a82ecdbbb9b2eda30a8192e673f83 (diff)
parent988be44c36f320e1aff08a0cf9a531441477b9d7 (diff)
downloadrust-922a262c43dd548daf129d86ae7e9cd29eb5efe1.tar.gz
rust-922a262c43dd548daf129d86ae7e9cd29eb5efe1.zip
Rollup merge of #40047 - topecongiro:master, r=est31
Add compile fail test for unboxed_closures feature

Hello, this is my first contribution to rust.
Issue #39059.
Diffstat (limited to 'src')
-rw-r--r--src/test/compile-fail/feature-gate-unboxed-closures.rs24
-rw-r--r--src/tools/tidy/src/features.rs4
2 files changed, 26 insertions, 2 deletions
diff --git a/src/test/compile-fail/feature-gate-unboxed-closures.rs b/src/test/compile-fail/feature-gate-unboxed-closures.rs
new file mode 100644
index 00000000000..40050217744
--- /dev/null
+++ b/src/test/compile-fail/feature-gate-unboxed-closures.rs
@@ -0,0 +1,24 @@
+// 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.
+
+struct Test;
+
+impl FnOnce<(u32, u32)> for Test {
+    type Output = u32;
+
+    extern "rust-call" fn call_once(self, (a, b): (u32, u32)) -> u32 {
+        a + b
+    }
+    //~^^^ ERROR rust-call ABI is subject to change (see issue #29625)
+}
+
+fn main() {
+    assert_eq!(Test(1u32, 2u32), 3u32);
+}
diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs
index 2c81382bc9b..c84fefd872e 100644
--- a/src/tools/tidy/src/features.rs
+++ b/src/tools/tidy/src/features.rs
@@ -169,8 +169,8 @@ pub fn check(path: &Path, bad: &mut bool) {
     let whitelist = vec![
         "abi_ptx", "simd",
         "cfg_target_has_atomic",
-        "unboxed_closures", "stmt_expr_attributes",
-        "cfg_target_thread_local", "unwind_attributes"
+        "stmt_expr_attributes",
+        "cfg_target_thread_local", "unwind_attributes",
     ];
 
     // Only check the number of lang features.