rustup, and some final message adjustments

Author: RalfJung

rust-version

@@ -1 +1 @@
-660326e9791d5caf3186b14521498c2584a494ab
+57e1da59cd0761330b4ea8d47b16340a78eeafa9

tests/compile-fail/cast_fn_ptr1.rs

@@ -1,9 +1,9 @@
 fn main() {
-    fn f() {}
+    fn f() {} //~ ERROR calling a function with more arguments than it expected
 
     let g = unsafe {
         std::mem::transmute::<fn(), fn(i32)>(f)
     };
 
-    g(42) //~ ERROR calling a function with more arguments than it expected
+    g(42)
 }

tests/compile-fail/cast_fn_ptr5.rs

@@ -1,9 +1,9 @@
 fn main() {
-    fn f() -> u32 { 42 }
+    fn f() -> u32 { 42 } //~ ERROR calling a function with return type u32 passing return place of type ()
 
     let g = unsafe {
         std::mem::transmute::<fn() -> u32, fn()>(f)
     };
 
-    g() //~ ERROR calling a function with return type u32 passing return place of type ()
+    g()
 }

tests/compile-fail/pointer_byte_read.rs

@@ -3,5 +3,5 @@ fn main() {
     let y = &x;
     let z = &y as *const &i32 as *const u8;
     // the deref fails, because we are reading only a part of the pointer
-    let _val = unsafe { *z }; //~ ERROR unable to turn this pointer into raw bytes
+    let _val = unsafe { *z }; //~ ERROR unable to turn pointer into raw bytes
 }

tests/compile-fail/reading_half_a_pointer.rs

@@ -24,6 +24,6 @@ fn main() {
     // starts 1 byte to the right, so using it would actually be wrong!
     let d_alias = &mut w.data as *mut _ as *mut *const u8;
     unsafe {
-        let _x = *d_alias; //~ ERROR unable to turn this pointer into raw bytes
+        let _x = *d_alias; //~ ERROR unable to turn pointer into raw bytes
     }
 }

tests/compile-fail/transmute_fat1.rs

@@ -10,5 +10,5 @@ fn main() {
     let bad = unsafe {
         std::mem::transmute::<&[u8], [u8; 8]>(&[1u8])
     };
-    let _val = bad[0] + bad[bad.len()-1]; //~ ERROR unable to turn this pointer into raw bytes
+    let _val = bad[0] + bad[bad.len()-1]; //~ ERROR unable to turn pointer into raw bytes
 }