diff options
| -rw-r--r-- | src/test/compile-fail/feature-gate-abi.rs | 8 | ||||
| -rw-r--r-- | src/tools/tidy/src/features.rs | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/test/compile-fail/feature-gate-abi.rs b/src/test/compile-fail/feature-gate-abi.rs index 517e37c3fa5..41efb92d450 100644 --- a/src/test/compile-fail/feature-gate-abi.rs +++ b/src/test/compile-fail/feature-gate-abi.rs @@ -11,6 +11,7 @@ // gate-test-intrinsics // gate-test-platform_intrinsics // gate-test-abi_vectorcall +// gate-test-abi_ptx // Functions extern "rust-intrinsic" fn f1() {} //~ ERROR intrinsics are subject to change @@ -18,6 +19,7 @@ extern "platform-intrinsic" fn f2() {} //~ ERROR platform intrinsics are experim extern "vectorcall" fn f3() {} //~ ERROR vectorcall is experimental and subject to change extern "rust-call" fn f4() {} //~ ERROR rust-call ABI is subject to change extern "msp430-interrupt" fn f5() {} //~ ERROR msp430-interrupt ABI is experimental +extern "ptx-kernel" fn f6() {} //~ ERROR PTX ABIs are experimental and subject to change // Methods in trait definition trait Tr { @@ -26,12 +28,14 @@ trait Tr { extern "vectorcall" fn m3(); //~ ERROR vectorcall is experimental and subject to change extern "rust-call" fn m4(); //~ ERROR rust-call ABI is subject to change extern "msp430-interrupt" fn m5(); //~ ERROR msp430-interrupt ABI is experimental + extern "ptx-kernel" fn m6(); //~ ERROR PTX ABIs are experimental and subject to change extern "rust-intrinsic" fn dm1() {} //~ ERROR intrinsics are subject to change extern "platform-intrinsic" fn dm2() {} //~ ERROR platform intrinsics are experimental extern "vectorcall" fn dm3() {} //~ ERROR vectorcall is experimental and subject to change extern "rust-call" fn dm4() {} //~ ERROR rust-call ABI is subject to change extern "msp430-interrupt" fn dm5() {} //~ ERROR msp430-interrupt ABI is experimental + extern "ptx-kernel" fn dm6() {} //~ ERROR PTX ABIs are experimental and subject to change } struct S; @@ -43,6 +47,7 @@ impl Tr for S { extern "vectorcall" fn m3() {} //~ ERROR vectorcall is experimental and subject to change extern "rust-call" fn m4() {} //~ ERROR rust-call ABI is subject to change extern "msp430-interrupt" fn m5() {} //~ ERROR msp430-interrupt ABI is experimental + extern "ptx-kernel" fn m6() {} //~ ERROR PTX ABIs are experimental and subject to change } // Methods in inherent impl @@ -52,6 +57,7 @@ impl S { extern "vectorcall" fn im3() {} //~ ERROR vectorcall is experimental and subject to change extern "rust-call" fn im4() {} //~ ERROR rust-call ABI is subject to change extern "msp430-interrupt" fn im5() {} //~ ERROR msp430-interrupt ABI is experimental + extern "ptx-kernel" fn im6() {} //~ ERROR PTX ABIs are experimental and subject to change } // Function pointer types @@ -60,6 +66,7 @@ type A2 = extern "platform-intrinsic" fn(); //~ ERROR platform intrinsics are ex type A3 = extern "vectorcall" fn(); //~ ERROR vectorcall is experimental and subject to change type A4 = extern "rust-call" fn(); //~ ERROR rust-call ABI is subject to change type A5 = extern "msp430-interrupt" fn(); //~ ERROR msp430-interrupt ABI is experimental +type A6 = extern "ptx-kernel" fn (); //~ ERROR PTX ABIs are experimental and subject to change // Foreign modules extern "rust-intrinsic" {} //~ ERROR intrinsics are subject to change @@ -67,5 +74,6 @@ extern "platform-intrinsic" {} //~ ERROR platform intrinsics are experimental extern "vectorcall" {} //~ ERROR vectorcall is experimental and subject to change extern "rust-call" {} //~ ERROR rust-call ABI is subject to change extern "msp430-interrupt" {} //~ ERROR msp430-interrupt ABI is experimental +extern "ptx-kernel" {} //~ ERROR PTX ABIs are experimental and subject to change fn main() {} diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs index 80254776849..3e951c85589 100644 --- a/src/tools/tidy/src/features.rs +++ b/src/tools/tidy/src/features.rs @@ -167,7 +167,7 @@ pub fn check(path: &Path, bad: &mut bool) { // FIXME get this whitelist empty. let whitelist = vec![ - "abi_ptx", "simd", + "simd", "stmt_expr_attributes", "cfg_target_thread_local", "unwind_attributes", ]; |