about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-10-04 23:42:07 +0000
committerbors <bors@rust-lang.org>2014-10-04 23:42:07 +0000
commitdc987adfc13f84c347005db18c46c0b45fce5d01 (patch)
tree67df779804637e018b899174f40914fe24569163
parent07aeac8ac80a9af809a022626773c903d2116bf7 (diff)
parent2bb7956a83fd55e6eed89199333676e7d2cbfc04 (diff)
downloadrust-dc987adfc13f84c347005db18c46c0b45fce5d01.tar.gz
rust-dc987adfc13f84c347005db18c46c0b45fce5d01.zip
auto merge of #17766 : pminten/rust/atomic-int-in-examples, r=alexcrichton
The examples for fetch_or, fetch_and and fetch_xor for
std::sync::atomic::AtomicInt used AtomicUint instead of AtomicInt.
-rw-r--r--src/libcore/atomic.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libcore/atomic.rs b/src/libcore/atomic.rs
index e248b934b69..3e53746f58f 100644
--- a/src/libcore/atomic.rs
+++ b/src/libcore/atomic.rs
@@ -382,9 +382,9 @@ impl AtomicInt {
     /// # Examples
     ///
     /// ```
-    /// use std::sync::atomic::{AtomicUint, SeqCst};
+    /// use std::sync::atomic::{AtomicInt, SeqCst};
     ///
-    /// let foo = AtomicUint::new(0b101101);
+    /// let foo = AtomicInt::new(0b101101);
     /// assert_eq!(0b101101, foo.fetch_and(0b110011, SeqCst));
     /// assert_eq!(0b100001, foo.load(SeqCst));
     #[inline]
@@ -397,9 +397,9 @@ impl AtomicInt {
     /// # Examples
     ///
     /// ```
-    /// use std::sync::atomic::{AtomicUint, SeqCst};
+    /// use std::sync::atomic::{AtomicInt, SeqCst};
     ///
-    /// let foo = AtomicUint::new(0b101101);
+    /// let foo = AtomicInt::new(0b101101);
     /// assert_eq!(0b101101, foo.fetch_or(0b110011, SeqCst));
     /// assert_eq!(0b111111, foo.load(SeqCst));
     #[inline]
@@ -412,9 +412,9 @@ impl AtomicInt {
     /// # Examples
     ///
     /// ```
-    /// use std::sync::atomic::{AtomicUint, SeqCst};
+    /// use std::sync::atomic::{AtomicInt, SeqCst};
     ///
-    /// let foo = AtomicUint::new(0b101101);
+    /// let foo = AtomicInt::new(0b101101);
     /// assert_eq!(0b101101, foo.fetch_xor(0b110011, SeqCst));
     /// assert_eq!(0b011110, foo.load(SeqCst));
     #[inline]