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

rustup

Author: bors

rust-version

@@ -1 +1 @@
-fa2692990c05652c7823c8d2afae501a00a69050
+73d96b090bb68065cd3a469b27cbd568e39bf0e7

test-cargo-miri/build.rs

@@ -1,4 +1,4 @@
-#![feature(llvm_asm)]
+#![feature(asm)]
 
 use std::env;
 
@@ -7,9 +7,9 @@ compile_error!("`miri` cfg should not be set in build script");
 
 fn not_in_miri() -> i32 {
     // Inline assembly definitely does not work in Miri.
-    let dummy = 42;
+    let mut dummy = 42;
     unsafe {
-        llvm_asm!("" : : "r"(&dummy));
+        asm!("/* {} */", in(reg) &mut dummy);
     }
     return dummy;
 }

tests/compile-fail/function_calls/exported_symbol_wrong_type.rs

@@ -5,5 +5,5 @@ fn main() {
     extern "C" {
         fn FOO();
     }
-    unsafe { FOO() } //~ ERROR unsupported operation: can't call foreign function: FOO
+    unsafe { FOO() } //~ ERROR attempt to call an exported symbol that is not defined as a function
 }