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

rustup

Author: bors

rust-version

@@ -1 +1 @@
-9bd53718e2537d95d8c092609618c2dcd6f05127
+d2df372bca13bb60979c909660e69f2451630e81

tests/compile-fail/null_pointer_deref.rs

@@ -1,5 +1,5 @@
 #[allow(deref_nullptr)]
 fn main() {
-    let x: i32 = unsafe { *std::ptr::null() }; //~ ERROR null pointer is not a valid pointer for this operation
+    let x: i32 = unsafe { *std::ptr::null() }; //~ ERROR null pointer is not a valid pointer
     panic!("this should never print: {}", x);
 }

tests/compile-fail/null_pointer_write.rs

@@ -1,4 +1,4 @@
 #[allow(deref_nullptr)]
 fn main() {
-    unsafe { *std::ptr::null_mut() = 0i32 }; //~ ERROR null pointer is not a valid pointer for this operation
+    unsafe { *std::ptr::null_mut() = 0i32 }; //~ ERROR null pointer is not a valid pointer
 }