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

Rustup; make use of AtomicPtr fixes

Author: bors

rust-version

@@ -1 +1 @@
-3ff10e74a74ed093fcabac1de27fe1cd65bbbb4a
+f0f68778f798d6d34649745b41770829b17ba5b8

tests/run-pass/leak-in-static.rs

@@ -1,8 +1,16 @@
+use std::{ptr, sync::atomic::{AtomicPtr, Ordering}};
+
 static mut LEAKER: Option<Box<Vec<i32>>> = None;
 
 fn main() {
     // Having memory "leaked" in globals is allowed.
     unsafe {
         LEAKER = Some(Box::new(vec![0; 42]));
     }
+
+    // Make sure this is allowed even when `AtomicPtr` is used.
+    {
+        static LEAK: AtomicPtr<usize> = AtomicPtr::new(ptr::null_mut());
+        LEAK.store(Box::into_raw(Box::new(0usize)), Ordering::SeqCst);
+    }
 }