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 | |
| parent | 9280d0c090ab62a1800c0e423b1da95b1e7db7ec (diff) | |
| download | rust-1c39fda0eaeb2f0e7bf37f0cac3541fb0cbc285f.tar.gz rust-1c39fda0eaeb2f0e7bf37f0cac3541fb0cbc285f.zip | |
Rename option::get_or_default to get_default, for consistency
| -rw-r--r-- | src/libcore/option.rs | 4 | ||||
| -rw-r--r-- | src/librustsyntax/parse/eval.rs | 2 | ||||
| -rw-r--r-- | src/rustc/middle/trans/base.rs | 2 | ||||
| -rw-r--r-- | src/rustdoc/attr_pass.rs | 2 | ||||
| -rw-r--r-- | src/rustdoc/config.rs | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs index eff29d1e55b..db0d0030f83 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -52,7 +52,7 @@ pure fn is_some<T>(opt: option<T>) -> bool { !is_none(opt) } -pure fn get_or_default<T: copy>(opt: option<T>, def: T) -> T { +pure fn get_default<T: copy>(opt: option<T>, def: T) -> T { #[doc = "Returns the contained value or a default"]; alt opt { some(x) { x } none { def } } @@ -94,7 +94,7 @@ impl extensions<T:copy> for option<T> { "] fn chain<U>(f: fn(T) -> option<U>) -> option<U> { chain(self, f) } #[doc = "Returns the contained value or a default"] - fn get_or_default(def: T) -> T { get_or_default(self, def) } + fn get_default(def: T) -> T { get_default(self, def) } #[doc = "Applies a function to the contained value or returns a default"] fn map_default<U: copy>(def: U, f: fn(T) -> U) -> U { map_default(self, def, f) } diff --git a/src/librustsyntax/parse/eval.rs b/src/librustsyntax/parse/eval.rs index bf4e9f798d6..59305bfd244 100644 --- a/src/librustsyntax/parse/eval.rs +++ b/src/librustsyntax/parse/eval.rs @@ -22,7 +22,7 @@ fn eval_crate_directives_to_mod(cx: ctx, cdirs: [@ast::crate_directive], -> (ast::_mod, [ast::attribute]) { #debug("eval crate prefix: %s", prefix); #debug("eval crate suffix: %s", - option::get_or_default(suffix, "none")); + option::get_default(suffix, "none")); let (cview_items, citems, cattrs) = parse_companion_mod(cx, prefix, suffix); let mut view_items: [@ast::view_item] = []; diff --git a/src/rustc/middle/trans/base.rs b/src/rustc/middle/trans/base.rs index 39de3a72949..4e7f495909e 100644 --- a/src/rustc/middle/trans/base.rs +++ b/src/rustc/middle/trans/base.rs @@ -2017,7 +2017,7 @@ fn monomorphic_fn(ccx: @crate_ctxt, fn_id: ast::def_id, real_substs: [ty::t], // ctors don't have attrs, at least not right now let tp_tys: [ty::t] = ty::ty_params_to_tys(ccx.tcx, tps); trans_class_ctor(ccx, pt, ctor.node.dec, ctor.node.body, lldecl, - option::get_or_default(psubsts, + option::get_default(psubsts, {tys:tp_tys, vtables: none, bounds: @[]}), fn_id.node, parent_id, ctor.span); } 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 }) }; |