---

yaml
---
r: 4419
b: refs/heads/master
c: d4fe1b3
h: refs/heads/master
i:
  4417: 29fbe6e
  4415: 3be859e
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c0297cfe7f09194e6cc4aa6a7decf0fd7f3fdef
+refs/heads/master: d4fe1b312797fb311351d27d1dce0cec735c808f

trunk/src/lib/getopts.rs

@@ -209,40 +209,40 @@ fn getopts_ivec(args: &str[], opts: &opt[]) -> result {
     ret success({opts: opts, vals: vals, free: free});
 }
 
-fn opt_vals(m: match, nm: str) -> optval[] {
+fn opt_vals(m: &match, nm: str) -> optval[] {
     ret alt find_opt(m.opts, mkname(nm)) {
           some(id) { m.vals.(id) }
           none. { log_err "No option '" + nm + "' defined."; fail }
         };
 }
 
-fn opt_val(m: match, nm: str) -> optval { ret opt_vals(m, nm).(0); }
+fn opt_val(m: &match, nm: str) -> optval { ret opt_vals(m, nm).(0); }
 
-fn opt_present(m: match, nm: str) -> bool {
+fn opt_present(m: &match, nm: str) -> bool {
     ret ivec::len[optval](opt_vals(m, nm)) > 0u;
 }
 
-fn opt_str(m: match, nm: str) -> str {
+fn opt_str(m: &match, nm: str) -> str {
     ret alt opt_val(m, nm) { val(s) { s } _ { fail } };
 }
 
-fn opt_strs(m: match, nm: str) -> vec[str] {
+fn opt_strs(m: &match, nm: str) -> vec[str] {
     let acc: vec[str] = [];
     for v: optval  in opt_vals(m, nm) {
         alt v { val(s) { acc += [s]; } _ { } }
     }
     ret acc;
 }
 
-fn opt_strs_ivec(m: match, nm: str) -> str[] {
+fn opt_strs_ivec(m: &match, nm: str) -> str[] {
     let acc: str[] = ~[];
     for v: optval  in opt_vals(m, nm) {
         alt v { val(s) { acc += ~[s]; } _ { } }
     }
     ret acc;
 }
 
-fn opt_maybe_str(m: match, nm: str) -> option::t[str] {
+fn opt_maybe_str(m: &match, nm: str) -> option::t[str] {
     let vals = opt_vals(m, nm);
     if ivec::len[optval](vals) == 0u { ret none[str]; }
     ret alt vals.(0) { val(s) { some[str](s) } _ { none[str] } };
@@ -252,7 +252,7 @@ fn opt_maybe_str(m: match, nm: str) -> option::t[str] {
 /// Returns none if the option was not present, `def` if the option was
 /// present but no argument was provided, and the argument if the option was
 /// present and an argument was provided.
-fn opt_default(m: match, nm: str, def: str) -> option::t[str] {
+fn opt_default(m: &match, nm: str, def: str) -> option::t[str] {
     let vals = opt_vals(m, nm);
     if ivec::len[optval](vals) == 0u { ret none[str]; }
     ret alt vals.(0) { val(s) { some[str](s) } _ { some[str](def) } }