From: Ralf Jung <post@ralfj.de>
Date: Fri, 1 May 2020 08:29:39 +0000 (+0200)
Subject: rustup, adjust error messages
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=1a704a517a46c84ca6d347b863ea12173f55b8ec;p=rust.git

rustup, adjust error messages
---

diff --git a/rust-version b/rust-version
index 173566bdf61..1070924d744 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-fb5615a4771ea3d54256f969dc84d2dfd38d812c
+e94eaa6dce468928b4e1326b2f0054f3075681ff
diff --git a/tests/compile-fail/validity/execute_memory.rs b/tests/compile-fail/validity/execute_memory.rs
index 426a51faf8a..5230e7fdf52 100644
--- a/tests/compile-fail/validity/execute_memory.rs
+++ b/tests/compile-fail/validity/execute_memory.rs
@@ -3,6 +3,6 @@
 fn main() {
     let x = box 42;
     unsafe {
-        let _f = std::mem::transmute::<Box<i32>, fn()>(x); //~ ERROR encountered a pointer, but expected a function pointer
+        let _f = std::mem::transmute::<Box<i32>, fn()>(x); //~ ERROR expected a function pointer
     }
 }
diff --git a/tests/compile-fail/validity/fn_ptr_offset.rs b/tests/compile-fail/validity/fn_ptr_offset.rs
index 5eec58b5e23..c651fbe070f 100644
--- a/tests/compile-fail/validity/fn_ptr_offset.rs
+++ b/tests/compile-fail/validity/fn_ptr_offset.rs
@@ -6,5 +6,5 @@ fn main() {
     let x : fn() = f;
     let y : *mut u8 = unsafe { mem::transmute(x) };
     let y = y.wrapping_offset(1);
-    let _x : fn() = unsafe { mem::transmute(y) }; //~ ERROR encountered a pointer, but expected a function pointer
+    let _x : fn() = unsafe { mem::transmute(y) }; //~ ERROR expected a function pointer
 }
diff --git a/tests/compile-fail/validity/invalid_bool.rs b/tests/compile-fail/validity/invalid_bool.rs
index 35f4d4228e7..0b2d648d02a 100644
--- a/tests/compile-fail/validity/invalid_bool.rs
+++ b/tests/compile-fail/validity/invalid_bool.rs
@@ -1,3 +1,3 @@
 fn main() {
-    let _b = unsafe { std::mem::transmute::<u8, bool>(2) }; //~ ERROR encountered 2, but expected a boolean
+    let _b = unsafe { std::mem::transmute::<u8, bool>(2) }; //~ ERROR encountered 0x02, but expected a boolean
 }
diff --git a/tests/compile-fail/validity/invalid_char.rs b/tests/compile-fail/validity/invalid_char.rs
index 42922cdc917..2801f329715 100644
--- a/tests/compile-fail/validity/invalid_char.rs
+++ b/tests/compile-fail/validity/invalid_char.rs
@@ -1,6 +1,6 @@
 fn main() {
     assert!(std::char::from_u32(-1_i32 as u32).is_none());
-    let _val = match unsafe { std::mem::transmute::<i32, char>(-1) } { //~ ERROR encountered 4294967295, but expected a valid unicode codepoint
+    let _val = match unsafe { std::mem::transmute::<i32, char>(-1) } { //~ ERROR encountered 0xffffffff, but expected a valid unicode codepoint
         'a' => {true},
         'b' => {false},
         _ => {true},
diff --git a/tests/compile-fail/validity/invalid_enum_discriminant.rs b/tests/compile-fail/validity/invalid_enum_discriminant.rs
index 13be4e7dcea..a3234ba0920 100644
--- a/tests/compile-fail/validity/invalid_enum_discriminant.rs
+++ b/tests/compile-fail/validity/invalid_enum_discriminant.rs
@@ -4,5 +4,5 @@ pub enum Foo {
 }
 
 fn main() {
-    let _f = unsafe { std::mem::transmute::<i32, Foo>(42) }; //~ ERROR encountered 42, but expected a valid enum discriminant
+    let _f = unsafe { std::mem::transmute::<i32, Foo>(42) }; //~ ERROR encountered 0x0000002a, but expected a valid enum discriminant
 }
diff --git a/tests/compile-fail/validity/transmute_through_ptr.rs b/tests/compile-fail/validity/transmute_through_ptr.rs
index 4b6a3c95928..617781c1275 100644
--- a/tests/compile-fail/validity/transmute_through_ptr.rs
+++ b/tests/compile-fail/validity/transmute_through_ptr.rs
@@ -10,5 +10,5 @@ fn main() {
     let mut x = Bool::True;
     evil(&mut x);
     let _y = x; // reading this ought to be enough to trigger validation
-    //~^ ERROR encountered 44, but expected a valid enum discriminant
+    //~^ ERROR encountered 0x0000002c, but expected a valid enum discriminant
 }