about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-12-12 15:54:13 +0000
committerbors <bors@rust-lang.org>2017-12-12 15:54:13 +0000
commit707d0708158dabd9b0a12af21a4b51bf1713cb9e (patch)
treea1c74e7ef5aa33e94e90c5ac9733606276954631
parent4c2819d32604c2c5817d0d2639363aa47e80fd7a (diff)
parente4dc11d98d6e7d9fb42ce847ee6b6194e764d1b7 (diff)
downloadrust-707d0708158dabd9b0a12af21a4b51bf1713cb9e.tar.gz
rust-707d0708158dabd9b0a12af21a4b51bf1713cb9e.zip
Auto merge of #46647 - varkor:contrib-1, r=sfackler
Add `std::fmt::Pointer` implementation for `AtomicPtr`

Resolves #29212.
-rw-r--r--src/libcore/sync/atomic.rs8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs
index 4c6ff4d1bb4..e334d2014af 100644
--- a/src/libcore/sync/atomic.rs
+++ b/src/libcore/sync/atomic.rs
@@ -1819,3 +1819,11 @@ impl<T> fmt::Debug for AtomicPtr<T> {
         f.debug_tuple("AtomicPtr").field(&self.load(Ordering::SeqCst)).finish()
     }
 }
+
+#[cfg(target_has_atomic = "ptr")]
+#[stable(feature = "atomic_pointer", since = "1.24.0")]
+impl<T> fmt::Pointer for AtomicPtr<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Pointer::fmt(&self.load(Ordering::SeqCst), f)
+    }
+}