Auto merge of rust-lang#2680 - RalfJung:rustup, r=RalfJung

Rustup

rust-version

@@ -1 +1 @@
-2f8d8040166a730d0da7bba0f2864f0ef7ff6364
+7477c1f4f7d6bef037d523099b240d22aa1b63a0

src/shims/intrinsics/mod.rs

@@ -368,11 +368,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
             }
 
             // Other
-            "exact_div" => {
-                let [num, denom] = check_arg_count(args)?;
-                this.exact_div(&this.read_immediate(num)?, &this.read_immediate(denom)?, dest)?;
-            }
-
             "breakpoint" => {
                 let [] = check_arg_count(args)?;
                 // normally this would raise a SIGTRAP, which aborts if no debugger is connected

tests/pass/panic/catch_panic.rs

@@ -69,7 +69,7 @@ fn main() {
     });
 
     test(Some("align_offset: align is not a power-of-two"), |_old_val| {
-        (0usize as *const u8).align_offset(3);
+        let _ = (0usize as *const u8).align_offset(3);
         loop {}
     });