Simplify getopts::find_opt.

erickt · erickt · commit 8e9be037d190 · 2011-12-19T07:27:16.000-08:00
diff --git a/src/libstd/getopts.rs b/src/libstd/getopts.rs
@@ -149,10 +149,7 @@ fn name_str(nm: name) -> str {
 }
 
 fn find_opt(opts: [opt], nm: name) -> option::t<uint> {
-    let i = 0u;
-    let l = vec::len::<opt>(opts);
-    while i < l { if opts[i].name == nm { ret some::<uint>(i); } i += 1u; }
-    ret none::<uint>;
+    vec::position_pred(opts, { |opt| opt.name == nm })
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -149,10 +149,7 @@ fn name_str(nm: name) -> str {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`fn find_opt(opts: [opt], nm: name) -> option::t<uint> {`
`152`		`- let i = 0u;`
`153`		`- let l = vec::len::<opt>(opts);`
`154`		`- while i < l { if opts[i].name == nm { ret some::<uint>(i); } i += 1u; }`
`155`		`- ret none::<uint>;`
	`152`	`+ vec::position_pred(opts, { \|opt\| opt.name == nm })`
`156`	`153`	`}`
`157`	`154`
`158`	`155`	`/*`