about summary refs log tree commit diff
path: root/src/test/compile-fail/variadic-ffi.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-07 11:26:29 -0800
committerbors <bors@rust-lang.org>2014-02-07 11:26:29 -0800
commit56565eb129018a708445afcd6ea14f5b51cf27e5 (patch)
tree6ac3203e6798df65908f65ec403f99f19400bea3 /src/test/compile-fail/variadic-ffi.rs
parentca40da8b55a04394f1db11b6c7410e49b63c6e04 (diff)
parent730bdb6403dd47b98c1be6c4b3423edb28ca9477 (diff)
downloadrust-56565eb129018a708445afcd6ea14f5b51cf27e5.tar.gz
rust-56565eb129018a708445afcd6ea14f5b51cf27e5.zip
auto merge of #12055 : dguenther/rust/tidy_test, r=alexcrichton
This PR extends the tidy formatting check to rust files in the test folder. To facilitate this, a few flags were added to tidy:

* `xfail-tidy-cr` - Disables the check for CR characters for all following lines in the file
* `xfail-tidy-tab` - Disables the check for tab characters for all following lines in the file
* `xfail-tidy-linelength` - Disables the line length check for all following lines in the file

Checks should not have to be disabled often. I disabled line length checks in `debug-info` tests that use `debugger:` checks, but aside from that, there were relatively few exclusions. Running tidy on all the tests does slow down the formatting check, so it may be worth investigating further optimization.

cc #4534
Diffstat (limited to 'src/test/compile-fail/variadic-ffi.rs')
-rw-r--r--src/test/compile-fail/variadic-ffi.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/test/compile-fail/variadic-ffi.rs b/src/test/compile-fail/variadic-ffi.rs
index 3156cd9af32..d0599c2ba4b 100644
--- a/src/test/compile-fail/variadic-ffi.rs
+++ b/src/test/compile-fail/variadic-ffi.rs
@@ -24,10 +24,14 @@ fn main() {
         foo(1); //~ ERROR: this function takes at least 2 parameters but 1 parameter was supplied
 
         let x: extern "C" unsafe fn(f: int, x: u8) = foo;
-        //~^ ERROR: mismatched types: expected `extern "C" unsafe fn(int, u8)` but found `extern "C" unsafe fn(int, u8, ...)` (expected non-variadic fn but found variadic function)
+        //~^ ERROR: mismatched types: expected `extern "C" unsafe fn(int, u8)`
+        //          but found `extern "C" unsafe fn(int, u8, ...)`
+        //          (expected non-variadic fn but found variadic function)
 
         let y: extern "C" unsafe fn(f: int, x: u8, ...) = bar;
-        //~^ ERROR: mismatched types: expected `extern "C" unsafe fn(int, u8, ...)` but found `extern "C" extern fn(int, u8)` (expected variadic fn but found non-variadic function)
+        //~^ ERROR: mismatched types: expected `extern "C" unsafe fn(int, u8, ...)`
+        //          but found `extern "C" extern fn(int, u8)`
+        //          (expected variadic fn but found non-variadic function)
 
         foo(1, 2, 3f32); //~ ERROR: can't pass an f32 to variadic function, cast to c_double
         foo(1, 2, true); //~ ERROR: can't pass bool to variadic function, cast to c_int