---

yaml
---
r: 106071
b: refs/heads/auto
c: c297cff
h: refs/heads/master
i:
  106069: 81a2cb3
  106067: 63b7401
  106063: e383245
v: v3

Author: hatahet

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 175bf9470a2f1b95215b4b5dc1f12d949a0f8ddd
+refs/heads/auto: c297cff7771a84c417913b2023353cf44f9e260c
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/option.rs

@@ -149,7 +149,7 @@ impl<T> Option<T> {
         }
     }
 
-    /// Returns the contained value or a default
+    /// Returns the contained value or a default.
     #[inline]
     pub fn unwrap_or(self, def: T) -> T {
         match self {
@@ -158,7 +158,7 @@ impl<T> Option<T> {
         }
     }
 
-    /// Returns the contained value or computes it from a closure
+    /// Returns the contained value or computes it from a closure.
     #[inline]
     pub fn unwrap_or_else(self, f: || -> T) -> T {
         match self {
@@ -183,7 +183,7 @@ impl<T> Option<T> {
         match self { None => def, Some(t) => f(t) }
     }
 
-    /// Apply a function to the contained value or do nothing.
+    /// Applies a function to the contained value or does nothing.
     /// Returns true if the contained value was mutated.
     pub fn mutate(&mut self, f: |T| -> T) -> bool {
         if self.is_some() {
@@ -192,7 +192,7 @@ impl<T> Option<T> {
         } else { false }
     }
 
-    /// Apply a function to the contained value or set it to a default.
+    /// Applies a function to the contained value or sets it to a default.
     /// Returns true if the contained value was mutated, or false if set to the default.
     pub fn mutate_or_set(&mut self, def: T, f: |T| -> T) -> bool {
         if self.is_some() {
@@ -208,19 +208,19 @@ impl<T> Option<T> {
     // Iterator constructors
     /////////////////////////////////////////////////////////////////////////
 
-    /// Return an iterator over the possibly contained value
+    /// Returns an iterator over the possibly contained value.
     #[inline]
     pub fn iter<'r>(&'r self) -> Item<&'r T> {
         Item{opt: self.as_ref()}
     }
 
-    /// Return a mutable iterator over the possibly contained value
+    /// Returns a mutable iterator over the possibly contained value.
     #[inline]
     pub fn mut_iter<'r>(&'r mut self) -> Item<&'r mut T> {
         Item{opt: self.as_mut()}
     }
 
-    /// Return a consuming iterator over the possibly contained value
+    /// Returns a consuming iterator over the possibly contained value.
     #[inline]
     pub fn move_iter(self) -> Item<T> {
         Item{opt: self}
@@ -264,15 +264,15 @@ impl<T> Option<T> {
     pub fn or_else(self, f: || -> Option<T>) -> Option<T> {
         match self {
             Some(_) => self,
-            None => f(),
+            None => f()
         }
     }
 
     /////////////////////////////////////////////////////////////////////////
     // Misc
     /////////////////////////////////////////////////////////////////////////
 
-    /// Take the value out of the option, leaving a `None` in its place.
+    /// Takes the value out of the option, leaving a `None` in its place.
     #[inline]
     pub fn take(&mut self) -> Option<T> {
         mem::replace(self, None)
@@ -282,7 +282,7 @@ impl<T> Option<T> {
     #[inline(always)]
     pub fn filtered(self, f: |t: &T| -> bool) -> Option<T> {
         match self {
-            Some(x) => if f(&x) {Some(x)} else {None},
+            Some(x) => if f(&x) { Some(x) } else { None },
             None => None
         }
     }