Merge cfail and ui tests into ui tests

2 files changed, 23 insertions, 23 deletions

diff --git a/src/test/ui/transmute/transmute-from-fn-item-types-error.rs b/src/test/ui/transmute/transmute-from-fn-item-types-error.rs
index d60c97f1d59..0a0214a24ff 100644
--- a/src/test/ui/transmute/transmute-from-fn-item-types-error.rs
+++ b/src/test/ui/transmute/transmute-from-fn-item-types-error.rs
@@ -12,16 +12,16 @@ use std::mem;
 
 unsafe fn foo() -> (i8, *const (), Option<fn()>) {
     let i = mem::transmute(bar);
-    //~^ ERROR is zero-sized and can't be transmuted
-    //~^^ NOTE cast with `as` to a pointer instead
+    //~^ ERROR transmute called with types of different sizes
+
 
     let p = mem::transmute(foo);
-    //~^ ERROR is zero-sized and can't be transmuted
-    //~^^ NOTE cast with `as` to a pointer instead
+    //~^ ERROR can't transmute zero-sized type
+
 
     let of = mem::transmute(main);
-    //~^ ERROR is zero-sized and can't be transmuted
-    //~^^ NOTE cast with `as` to a pointer instead
+    //~^ ERROR can't transmute zero-sized type
+
 
     (i, p, of)
 }
@@ -30,15 +30,15 @@ unsafe fn bar() {
     // Error as usual if the resulting type is not pointer-sized.
     mem::transmute::<_, u8>(main);
     //~^ ERROR transmute called with types of different sizes
-    //~^^ NOTE transmuting between fn() {main} and u8
+
 
     mem::transmute::<_, *mut ()>(foo);
-    //~^ ERROR is zero-sized and can't be transmuted
-    //~^^ NOTE cast with `as` to a pointer instead
+    //~^ ERROR can't transmute zero-sized type
+
 
     mem::transmute::<_, fn()>(bar);
-    //~^ ERROR is zero-sized and can't be transmuted
-    //~^^ NOTE cast with `as` to a pointer instead
+    //~^ ERROR can't transmute zero-sized type
+
 
     // No error if a coercion would otherwise occur.
     mem::transmute::<fn(), usize>(main);
@@ -46,16 +46,16 @@ unsafe fn bar() {
 
 unsafe fn baz() {
     mem::transmute::<_, *mut ()>(Some(foo));
-    //~^ ERROR is zero-sized and can't be transmuted
-    //~^^ NOTE cast with `as` to a pointer instead
+    //~^ ERROR can't transmute zero-sized type
+
 
     mem::transmute::<_, fn()>(Some(bar));
-    //~^ ERROR is zero-sized and can't be transmuted
-    //~^^ NOTE cast with `as` to a pointer instead
+    //~^ ERROR can't transmute zero-sized type
+
 
     mem::transmute::<_, Option<fn()>>(Some(baz));
-    //~^ ERROR is zero-sized and can't be transmuted
-    //~^^ NOTE cast with `as` to a pointer instead
+    //~^ ERROR can't transmute zero-sized type
+
 
     // No error if a coercion would otherwise occur.
     mem::transmute::<Option<fn()>, usize>(Some(main));
diff --git a/src/test/ui/transmute/transmute-type-parameters.rs b/src/test/ui/transmute/transmute-type-parameters.rs
index 117fc2cc5df..fe340295f74 100644
--- a/src/test/ui/transmute/transmute-type-parameters.rs
+++ b/src/test/ui/transmute/transmute-type-parameters.rs
@@ -19,17 +19,17 @@ use std::mem::transmute;
 
 unsafe fn f<T>(x: T) {
     let _: i32 = transmute(x);
-//~^ ERROR differently sized types: T (size can vary) to i32
+//~^ ERROR transmute called with types of different sizes
 }
 
 unsafe fn g<T>(x: (T, i32)) {
     let _: i32 = transmute(x);
-//~^ ERROR differently sized types: (T, i32) (size can vary because of T) to i32
+//~^ ERROR transmute called with types of different sizes
 }
 
 unsafe fn h<T>(x: [T; 10]) {
     let _: i32 = transmute(x);
-//~^ ERROR differently sized types: [T; 10] (size can vary because of T) to i32
+//~^ ERROR transmute called with types of different sizes
 }
 
 struct Bad<T> {
@@ -38,7 +38,7 @@ struct Bad<T> {
 
 unsafe fn i<T>(x: Bad<T>) {
     let _: i32 = transmute(x);
-//~^ ERROR differently sized types: Bad<T> (size can vary because of T) to i32
+//~^ ERROR transmute called with types of different sizes
 }
 
 enum Worse<T> {
@@ -48,12 +48,12 @@ enum Worse<T> {
 
 unsafe fn j<T>(x: Worse<T>) {
     let _: i32 = transmute(x);
-//~^ ERROR differently sized types: Worse<T> (size can vary because of T) to i32
+//~^ ERROR transmute called with types of different sizes
 }
 
 unsafe fn k<T>(x: Option<T>) {
     let _: i32 = transmute(x);
-//~^ ERROR differently sized types: std::option::Option<T> (size can vary because of T) to i32
+//~^ ERROR transmute called with types of different sizes
 }
 
 fn main() {}