about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-02-22 01:50:22 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-02-22 01:50:22 +0530
commitdcbf2265184c6e02b7c4b21f74b82bd6d7c9ab2a (patch)
tree01a43e9da583b48dca307399545a7a4fd2135406
parentb53e51029757bdbfea0992f9a4650e753f04189b (diff)
parent7e533a972cf6cd5edbfae019955cc3d7d0c848ca (diff)
Rollup merge of #22633 - wesleywiser:fix_22586, r=sfackler
 AtomicOption was removed in 7d8d06f86b48520814596bd5363d2b82bc619774
but the docs weren't updated.

Fixes #22586
-rw-r--r--src/libcore/atomic.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/atomic.rs b/src/libcore/atomic.rs
index 6afe5b2257d..38e2bd98ef9 100644
--- a/src/libcore/atomic.rs
+++ b/src/libcore/atomic.rs
@@ -15,7 +15,7 @@
 //! types.
 //!
 //! This module defines atomic versions of a select number of primitive
-//! types, including `AtomicBool`, `AtomicIsize`, `AtomicUsize`, and `AtomicOption`.
+//! types, including `AtomicBool`, `AtomicIsize`, and `AtomicUsize`.
 //! Atomic types present operations that, when used correctly, synchronize
 //! updates between threads.
 //!