---

yaml
---
r: 65783
b: refs/heads/master
c: 4f2f545
h: refs/heads/master
i:
  65781: bacf2f6
  65779: 91adc33
  65775: 5f379ac
v: v3

Author: thestinger

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d0b197900485c98cf2a09298823ea274db50c4d9
+refs/heads/master: 4f2f545ac2ce19034b138006e7ac76e502b3188b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/libextra/getopts.rs

@@ -31,22 +31,21 @@
  * file name following -o, and accepts both -h and --help as optional flags.
  *
  * ```
- *    extern mod extra;
- *    use extra::getopts::*;
- *    use std::os;
+ *    extern mod std;
+ *    use std::getopts::*;
  *
  *    fn do_work(in: &str, out: Option<~str>) {
- *        println(in);
- *        println(match out {
- *            Some(x) => x,
- *            None => ~"No Output"
- *        });
+ *      io::println(in);
+ *      io::println(match out {
+ *        Some(x) => x,
+ *        None => ~"No Output"
+ *      });
  *    }
  *
- *    fn print_usage(program: &str, _opts: &[Opt]) {
- *        println(fmt!("Usage: %s [options]", program));
- *        println("-o\t\tOutput");
- *        println("-h --help\tUsage");
+ *    fn print_usage(program: &str, _opts: &[std::getopts::Opt]) {
+ *      io::println(fmt!("Usage: %s [options]", program));
+ *      io::println("-o\t\tOutput");
+ *      io::println("-h --help\tUsage");
  *    }
  *
  *    fn main() {
@@ -59,9 +58,9 @@
  *            optflag("h"),
  *            optflag("help")
  *        ];
- *        let matches = match getopts(args.tail(), opts) {
- *            Ok(m) => { m }
- *            Err(f) => { fail!(fail_str(f)) }
+ *        let matches = match getopts(vec::tail(args), opts) {
+ *            result::Ok(m) => { m }
+ *            result::Err(f) => { fail!(fail_str(f)) }
  *        };
  *        if opt_present(&matches, "h") || opt_present(&matches, "help") {
  *            print_usage(program, opts);

trunk/src/libstd/option.rs

@@ -48,6 +48,7 @@ use util;
 use num::Zero;
 use old_iter::{BaseIter, MutableIter, ExtendedIter};
 use old_iter;
+use iterator::Iterator;
 use str::StrSlice;
 use clone::DeepClone;
 
@@ -146,7 +147,24 @@ impl<A> ExtendedIter<A> for Option<A> {
 }
 
 impl<T> Option<T> {
+    #[inline]
+    pub fn iter<'r>(&'r self) -> OptionIterator<'r, T> {
+        match *self {
+            Some(ref x) => OptionIterator{opt: Some(x)},
+            None => OptionIterator{opt: None}
+        }
+    }
+
+    #[inline]
+    pub fn mut_iter<'r>(&'r mut self) -> OptionMutIterator<'r, T> {
+        match *self {
+            Some(ref mut x) => OptionMutIterator{opt: Some(x)},
+            None => OptionMutIterator{opt: None}
+        }
+    }
+
     /// Returns true if the option equals `none`
+    #[inline]
     pub fn is_none(&const self) -> bool {
         match *self { None => true, Some(_) => false }
     }
@@ -376,6 +394,26 @@ impl<T:Copy + Zero> Option<T> {
     }
 }
 
+pub struct OptionIterator<'self, A> {
+    priv opt: Option<&'self A>
+}
+
+impl<'self, A> Iterator<&'self A> for OptionIterator<'self, A> {
+    fn next(&mut self) -> Option<&'self A> {
+        util::replace(&mut self.opt, None)
+    }
+}
+
+pub struct OptionMutIterator<'self, A> {
+    priv opt: Option<&'self mut A>
+}
+
+impl<'self, A> Iterator<&'self mut A> for OptionMutIterator<'self, A> {
+    fn next(&mut self) -> Option<&'self mut A> {
+        util::replace(&mut self.opt, None)
+    }
+}
+
 #[test]
 fn test_unwrap_ptr() {
     unsafe {