user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4032 from catamorphism/getopts

Browse source 
[libstd] getopts, now with fewer copies
This commit is contained in:
Graydon Hoare 2012-11-28 08:47:25 -08:00
commit 082a88e42c
10 changed files with 68 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustdoc/config.rs
View file

@ -128,14 +128,14 @@ fn parse_config_(
args: &[~str],
+program_output: ProgramOutput
) -> Result<Config, ~str> {
let args = vec::tail(args);
let args = args.tail();
let opts = vec::unzip(opts()).first();
match getopts::getopts(args, opts) {
result::Ok(matches) => {
if vec::len(matches.free) == 1u {
if matches.free.len() == 1 {
let input_crate = Path(vec::head(matches.free));
config_from_opts(&input_crate, matches, move program_output)
} else if vec::is_empty(matches.free) {
config_from_opts(&input_crate, &matches, move program_output)
} else if matches.free.is_empty() {
result::Err(~"no crates specified")
} else {
result::Err(~"multiple crates specified")
@ -149,7 +149,7 @@ fn parse_config_(
fn config_from_opts(
input_crate: &Path,
+matches: getopts::Matches,
matches: &getopts::Matches,
+program_output: ProgramOutput
) -> Result<Config, ~str> {