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

rustup, adjust error message

Author: bors

rust-version

@@ -1 +1 @@
-0e9e4083100aa3ebf09b8f1ace0348cb37475eb9
+b6fa392238a459c29a47e2cf824d79a49a8ba039

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 0xffffffff, but expected a valid unicode codepoint
+    let _val = match unsafe { std::mem::transmute::<i32, char>(-1) } { //~ ERROR encountered 0xffffffff, but expected a valid unicode scalar value
         'a' => {true},
         'b' => {false},
         _ => {true},