Auto merge of #1247 - RalfJung:rustup, r=RalfJung

call error location was fixed by rustup

Author: bors

rust-version

@@ -1 +1 @@
-f4c675c476c18b1a11041193f2f59d695b126bc8
+98803c182b2ba6ef5dccb6bf501958249295eac0

src/bin/miri-rustc-tests.rs

@@ -1,13 +1,9 @@
 #![feature(rustc_private)]
-extern crate getopts;
 extern crate miri;
 extern crate rustc;
-extern crate rustc_codegen_utils;
 extern crate rustc_driver;
-extern crate rustc_errors;
 extern crate rustc_hir;
 extern crate rustc_interface;
-extern crate rustc_metadata;
 extern crate rustc_span;
 
 use std::io;

tests/compile-fail/cast_fn_ptr1.rs

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

tests/compile-fail/cast_fn_ptr5.rs

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