Auto merge of #2707 - oli-obk:ui_test_bump, r=RalfJung

Bump ui_test crate

All commands can now be revisioned: oli-obk/ui_test#33

Author: bors

Cargo.lock

@@ -39,7 +39,7 @@ libloading = "0.7"
 
 [dev-dependencies]
 colored = "2"
-ui_test = "0.4"
+ui_test = "0.5"
 rustc_version = "0.4"
 # Features chosen to match those required by env_logger, to avoid rebuilds
 regex = { version = "1.5.5", default-features = false, features = ["perf", "std"] }

Cargo.toml

@@ -12,7 +12,7 @@ fn main() {
     #[cfg(fn_ptr)]
     unsafe {
         std::mem::transmute::<unsafe fn(), unsafe extern "C" fn()>(foo)();
-        //[fn_ptr]~^ ERROR: calling a function with calling convention Rust using calling convention C
+        //~[fn_ptr]^ ERROR: calling a function with calling convention Rust using calling convention C
     }
 
     // `Instance` caching should not suppress ABI check.
@@ -28,8 +28,8 @@ fn main() {
         }
         unsafe {
             foo();
-            //[no_cache]~^ ERROR: calling a function with calling convention Rust using calling convention C
-            //[cache]~| ERROR: calling a function with calling convention Rust using calling convention C
+            //~[no_cache]^ ERROR: calling a function with calling convention Rust using calling convention C
+            //~[cache]| ERROR: calling a function with calling convention Rust using calling convention C
         }
     }
 }

tests/fail/function_calls/exported_symbol_abi_mismatch.rs

@@ -4,8 +4,8 @@
 #[cfg_attr(any(definition, both), rustc_nounwind)]
 #[no_mangle]
 extern "C-unwind" fn nounwind() {
-    //[definition]~^ ERROR: abnormal termination: the program aborted execution
-    //[both]~^^ ERROR: abnormal termination: the program aborted execution
+    //~[definition]^ ERROR: abnormal termination: the program aborted execution
+    //~[both]^^ ERROR: abnormal termination: the program aborted execution
     panic!();
 }
 
@@ -15,5 +15,5 @@ fn main() {
         fn nounwind();
     }
     unsafe { nounwind() }
-    //[extern_block]~^ ERROR: unwinding past a stack frame that does not allow unwinding
+    //~[extern_block]^ ERROR: unwinding past a stack frame that does not allow unwinding
 }