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

bump Rust for exact_div fix

diff --git a/rust-version b/rust-version
index e81e0579a386c901c42d2bc7174032af446d223f..e1047d816e22866251fadb41afb66ff907bc267a 100644 (file)
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-4787e97475de6be9487e3d9255a9c2d3c0bf9252
+f577b0ef6e637ab7a6095cdfe0b51fa3faf97050

diff --git a/tests/compile-fail/exact_div3.rs b/tests/compile-fail/exact_div3.rs
index 0460e412e45e225c2effcb3ed6cc5bc39c31846f..0d5097a87a20829fa5505915571897f692abe691 100644 (file)
--- a/tests/compile-fail/exact_div3.rs
+++ b/tests/compile-fail/exact_div3.rs
@@ -1,5 +1,5 @@
 #![feature(core_intrinsics)]
 fn main() {
     // signed divison with a remainder
-    unsafe { std::intrinsics::exact_div(-19i8, 2); } //~ ERROR 237 cannot be divided by 2 without remainder
+    unsafe { std::intrinsics::exact_div(-19i8, 2); } //~ ERROR -19 cannot be divided by 2 without remainder
 }