about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-07-11 19:18:02 +0000
committerbors <bors@rust-lang.org>2015-07-11 19:18:02 +0000
commitd18eb74009924648cf8b6fe652f6ac4ab2a37718 (patch)
treeedf8bbcbf5ac7a7840158e2ca2d2bee0a3ca26a0
parent1b28ffa5216c845d1cef6b0cb3e5ac7db12025d0 (diff)
parentdad8cd19d332e482e0c494600db5da596240f572 (diff)
Auto merge of #26878 - Esption:master, r=pnkfelix
I noticed in docs, specifically http://doc.rust-lang.org/std/primitive.u8.html#method.is_power_of_two, that it was like this, and it was apparently in multiple places too.

Didn't change any occurrences through the cross-depo things. There's a lot in /src/llvm/ for instance, but I'm not confident on how to go about sending fixes for those, so this is just what's in the base rust depo.

r? @steveklabnik
-rw-r--r--src/libcollections/vec_deque.rs2
-rw-r--r--src/libcore/num/mod.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libcollections/vec_deque.rs b/src/libcollections/vec_deque.rs
index 2aeb303068b..117b3544f02 100644
--- a/src/libcollections/vec_deque.rs
+++ b/src/libcollections/vec_deque.rs
@@ -108,7 +108,7 @@ impl<T> VecDeque<T> {
         ptr::write(self.ptr.offset(off as isize), t);
     }
 
-    /// Returns true iff the buffer is at capacity
+    /// Returns true if and only if the buffer is at capacity
     #[inline]
     fn is_full(&self) -> bool { self.cap - self.len() == 1 }
 
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index fd5ef4b1ccc..3fd3d4a42b2 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -1126,7 +1126,7 @@ macro_rules! uint_impl {
             acc
         }
 
-        /// Returns `true` iff `self == 2^k` for some `k`.
+        /// Returns `true` if and only if `self == 2^k` for some `k`.
         #[stable(feature = "rust1", since = "1.0.0")]
         #[inline]
         pub fn is_power_of_two(self) -> bool {