diff options
| author | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-04-11 09:24:46 -0700 |
|---|---|---|
| committer | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-04-23 20:52:50 -0700 |
| commit | 1c39fda0eaeb2f0e7bf37f0cac3541fb0cbc285f (patch) | |
| tree | 200e2ae35f7258b6e96e6074d927c4bc80a812d5 /src/rustdoc | |
| parent | 9280d0c090ab62a1800c0e423b1da95b1e7db7ec (diff) | |
| download | rust-1c39fda0eaeb2f0e7bf37f0cac3541fb0cbc285f.tar.gz rust-1c39fda0eaeb2f0e7bf37f0cac3541fb0cbc285f.zip | |
Rename option::get_or_default to get_default, for consistency
Diffstat (limited to 'src/rustdoc')
| -rw-r--r-- | src/rustdoc/attr_pass.rs | 2 | ||||
| -rw-r--r-- | src/rustdoc/config.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rustdoc/attr_pass.rs b/src/rustdoc/attr_pass.rs index 674d7a7fc3b..232b72d369a 100644 --- a/src/rustdoc/attr_pass.rs +++ b/src/rustdoc/attr_pass.rs @@ -50,7 +50,7 @@ fn fold_crate( { topmod: { item: { - name: option::get_or_default(attrs.name, doc.topmod.name()) + name: option::get_default(attrs.name, doc.topmod.name()) with doc.topmod.item } with doc.topmod diff --git a/src/rustdoc/config.rs b/src/rustdoc/config.rs index 3c2a11b0516..fc8bbf09a65 100644 --- a/src/rustdoc/config.rs +++ b/src/rustdoc/config.rs @@ -125,7 +125,7 @@ fn config_from_opts( let result = result::chain(result) {|config| let output_dir = getopts::opt_maybe_str(match, opt_output_dir()); result::ok({ - output_dir: option::get_or_default(output_dir, config.output_dir) + output_dir: option::get_default(output_dir, config.output_dir) with config }) }; |