Merge pull request rust-lang#221 from dwrensha/rustup

update tests for new error message

Author: oli-obk

tests/compile-fail/cast_fn_ptr_unsafe.rs

@@ -2,7 +2,7 @@
 fn main() {
     fn f() {}
 
-    let g = f as fn() as unsafe fn(i32); //~ERROR: non-scalar cast: `fn()` as `unsafe fn(i32)`
+    let g = f as fn() as unsafe fn(i32); //~ERROR: non-primitive cast: `fn()` as `unsafe fn(i32)`
 
     unsafe {
         g(42);

tests/compile-fail/cast_fn_ptr_unsafe2.rs

@@ -2,7 +2,7 @@
 fn main() {
     fn f() {}
 
-    let g = f as fn() as fn(i32) as unsafe fn(i32); //~ERROR: non-scalar cast: `fn()` as `fn(i32)`
+    let g = f as fn() as fn(i32) as unsafe fn(i32); //~ERROR: non-primitive cast: `fn()` as `fn(i32)`
 
     unsafe {
         g(42);