---

yaml
---
r: 36349
b: refs/heads/try2
c: d701fcd
h: refs/heads/master
i:
  36347: dd542ec
v: v3

Author: jesse99

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 340955b3a55c0707e72d64b2ce4cdcf21529fafb
+refs/heads/try2: d701fcd8a52fdd1cf85516c546edcc8de9b5d400
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/doc/README

@@ -0,0 +1,13 @@
+The markdown docs are only generated by make when node is installed (use
+`make doc`). If you don't have node installed you can generate them yourself. 
+Unfortunately there's no real standard for markdown and all the tools work 
+differently. pandoc is one that seems to work well.
+
+To generate an html version of a doc do something like:
+pandoc --from=markdown --to=html --number-sections -o build/doc/rust.html doc/rust.md && git web--browse build/doc/rust.html
+
+The syntax for pandoc flavored markdown can be found at:
+http://johnmacfarlane.net/pandoc/README.html#pandocs-markdown
+
+A nice quick reference (for non-pandoc markdown) is at:
+http://kramdown.rubyforge.org/quickref.html

branches/try2/src/libstd/getopts.rs

@@ -145,11 +145,6 @@ pub fn optflag(name: &str) -> Opt {
     return {name: mkname(name), hasarg: No, occur: Optional};
 }
 
-/// Create an option that is optional and does not take an argument
-pub fn optflagmulti(name: &str) -> Opt {
-    return {name: mkname(name), hasarg: No, occur: Multi};
-}
-
 /// Create an option that is optional and takes an optional argument
 pub fn optflagopt(name: &str) -> Opt {
     return {name: mkname(name), hasarg: Maybe, occur: Optional};
@@ -422,11 +417,6 @@ pub fn opt_present(mm: Matches, nm: &str) -> bool {
     return vec::len::<Optval>(opt_vals(mm, nm)) > 0u;
 }
 
-/// Returns the number of times an option was matched
-pub fn opt_count(mm: Matches, nm: &str) -> uint {
-    return vec::len::<Optval>(opt_vals(mm, nm));
-}
-
 /// Returns true if any of several options were matched
 pub fn opts_present(mm: Matches, names: &[~str]) -> bool {
     for vec::each(names) |nm| {
@@ -1013,71 +1003,6 @@ mod tests {
         }
     }
 
-    // Tests for optflagmulti
-    #[test]
-    fn test_optflagmulti_short1() {
-        let args = ~[~"-v"];
-        let opts = ~[optflagmulti(~"v")];
-        let rs = getopts(args, opts);
-        match rs {
-          Ok(copy m) => {
-            assert (opt_count(m, ~"v") == 1);
-          }
-          _ => fail
-        }
-    }
-
-    #[test]
-    fn test_optflagmulti_short2a() { 
-        let args = ~[~"-v", ~"-v"];
-        let opts = ~[optflagmulti(~"v")];
-        let rs = getopts(args, opts);
-        match rs {
-          Ok(copy m) => {
-            assert (opt_count(m, ~"v") == 2);
-          }
-          _ => fail
-        }
-    }
-
-    #[test]
-    fn test_optflagmulti_short2b() {
-        let args = ~[~"-vv"];
-        let opts = ~[optflagmulti(~"v")];
-        let rs = getopts(args, opts);
-        match rs {
-          Ok(copy m) => {
-            assert (opt_count(m, ~"v") == 2);
-          }
-          _ => fail
-        }
-    }
-
-    #[test]
-    fn test_optflagmulti_long1() {
-        let args = ~[~"--verbose"];
-        let opts = ~[optflagmulti(~"verbose")];
-        let rs = getopts(args, opts);
-        match rs {
-          Ok(copy m) => {
-            assert (opt_count(m, ~"verbose") == 1);
-          }
-          _ => fail
-        }
-    }
-
-    #[test]
-    fn test_optflagmulti_long2() {
-        let args = ~[~"--verbose", ~"--verbose"];
-        let opts = ~[optflagmulti(~"verbose")];
-        let rs = getopts(args, opts);
-        match rs {
-          Ok(copy m) => {
-            assert (opt_count(m, ~"verbose") == 2);
-          }
-          _ => fail
-        }
-    }
 
     // Tests for optmulti
     #[test]