about summary refs log tree commit diff
path: root/src/libcore/sync/atomic.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-04-01 17:06:04 -0700
committerbors <bors@rust-lang.org>2016-04-01 17:06:04 -0700
commit18172d1375274050fbe37acd9b3c884f2caaacb9 (patch)
tree2216dff2fd4cbda8c4ff6b81690a47cec7f8e561 /src/libcore/sync/atomic.rs
parentc8b8eb1fda90998832ba1cdf96a34dc676f7124b (diff)
parent45c4769920caf7e8099dcf0c9533b071e8dbbda8 (diff)
Auto merge of #32666 - Manishearth:rollup, r=Manishearth
Rollup of 11 pull requests

- Successful merges: #32622, #32629, #32640, #32641, #32642, #32645, #32647, #32649, #32652, #32654, #32656
- Failed merges:
Diffstat (limited to 'src/libcore/sync/atomic.rs')
-rw-r--r--src/libcore/sync/atomic.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs
index 7ae129eaf48..d2e98a795d9 100644
--- a/src/libcore/sync/atomic.rs
+++ b/src/libcore/sync/atomic.rs
@@ -695,7 +695,7 @@ impl AtomicIsize {
         unsafe { atomic_compare_exchange(self.v.get(), current, new, success, failure) }
     }
 
-    /// Stores a value into the `isize if the current value is the same as the `current` value.
+    /// Stores a value into the `isize` if the current value is the same as the `current` value.
     ///
     /// Unlike `compare_exchange`, this function is allowed to spuriously fail even when the
     /// comparison succeeds, which can result in more efficient code on some platforms. The