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

bors · bors · commit ea3eee05444b · 2019-09-29T15:31:59.000Z
fix test failure from diagnostics change @oli-obk looks like with some recent change, the error about the shift now needs `const_err` instead of `exceeding_bitshifts` to be silenced?
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-084beb83e0e87d673d5fabc844d28e8e8ae2ab4c
+488381ce9ef0ceabe83b73127c659e5d38137df0
diff --git a/tests/compile-fail/overflowing-rsh-1.rs b/tests/compile-fail/overflowing-rsh-1.rs
@@ -1,4 +1,4 @@
-#![allow(exceeding_bitshifts)]
+#![allow(exceeding_bitshifts, const_err)]
 
 fn main() {
     let _n = 1i64 >> 64; //~ ERROR attempt to shift right with overflow

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-084beb83e0e87d673d5fabc844d28e8e8ae2ab4c`
	`1`	`+488381ce9ef0ceabe83b73127c659e5d38137df0`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#![allow(exceeding_bitshifts)]`
	`1`	`+#![allow(exceeding_bitshifts, const_err)]`
`2`	`2`
`3`	`3`	`fn main() {`
`4`	`4`	`let _n = 1i64 >> 64; //~ ERROR attempt to shift right with overflow`