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

rustup Cc rust-lang/rust#88016
rust-lang · Aug 14, 2021 · 13fae3d · 13fae3d
2 parents 042cbf1 + 78b4c7b
commit 13fae3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-996ff2e0a0f911f52bb1de6bdd0cfd5704de1fc9
+fa2692990c05652c7823c8d2afae501a00a69050
diff --git a/tests/compile-fail/function_calls/exported_symbol_wrong_type.rs b/tests/compile-fail/function_calls/exported_symbol_wrong_type.rs
@@ -5,5 +5,5 @@ fn main() {
     extern "C" {
         fn FOO();
     }
-    unsafe { FOO() } //~ ERROR attempt to call an exported symbol that is not defined as a function
+    unsafe { FOO() } //~ ERROR unsupported operation: can't call foreign function: FOO
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		996ff2e0a0f911f52bb1de6bdd0cfd5704de1fc9
		fa2692990c05652c7823c8d2afae501a00a69050