diff options
| author | bors <bors@rust-lang.org> | 2013-03-10 21:39:46 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-10 21:39:46 -0700 |
| commit | 58618fb8cfd791a930261ff68ae6bc77e0bc4412 (patch) | |
| tree | 44d1b45482b343ca282064fc0936af01157093b9 /src | |
| parent | 1d8596d400b245143df4a421654d7a94a8b4c1e1 (diff) | |
| parent | 13e58597a18d3d4a696bdd84750839655580ea55 (diff) | |
| download | rust-58618fb8cfd791a930261ff68ae6bc77e0bc4412.tar.gz rust-58618fb8cfd791a930261ff68ae6bc77e0bc4412.zip | |
auto merge of #5308 : wanderview/rust/std-getopts-rustdoc-fix, r=luqmana
There were three issues effecting the example in the getopts rustdoc: 1. The blockquote was incorrectly formatted. Fixed by switching to using an explicit markdown code section with ```. 2. The `fail fail_str(f)` would not compile. Fixed by using `fail!()` instead of `fail`. 3. The line `matches.free[0]` produced a compile error about moving from an immutable vector. Fix by using `copy`.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstd/getopts.rs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/libstd/getopts.rs b/src/libstd/getopts.rs index 2090a3728db..eed00ccacff 100644 --- a/src/libstd/getopts.rs +++ b/src/libstd/getopts.rs @@ -1,4 +1,4 @@ -// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -29,8 +29,10 @@ * The following example shows simple command line parsing for an application * that requires an input file to be specified, accepts an optional output * file name following -o, and accepts both -h and --help as optional flags. - * extern mod std; - * use std::getopts::*; + * + * ``` + * extern mod std; + * use std::getopts::*; * * fn do_work(in: &str, out: Option<~str>) { * io::println(in); @@ -58,7 +60,7 @@ * ]; * let matches = match getopts(vec::tail(args), opts) { * result::Ok(m) => { m } - * result::Err(f) => { fail fail_str(f) } + * result::Err(f) => { fail!(fail_str(f)) } * }; * if opt_present(&matches, "h") || opt_present(&matches, "help") { * print_usage(program, opts); @@ -66,13 +68,14 @@ * } * let output = opt_maybe_str(&matches, "o"); * let input: &str = if !matches.free.is_empty() { - * matches.free[0] + * copy matches.free[0] * } else { * print_usage(program, opts); * return; * }; * do_work(input, output); * } + * ``` */ use core::cmp::Eq; |
