---

yaml
---
r: 15623
b: refs/heads/try
c: 1c39fda
h: refs/heads/master
i:
  15621: c64f84c
  15619: 688f49b
  15615: d916bbd
v: v3

Author: catamorphism

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 9280d0c090ab62a1800c0e423b1da95b1e7db7ec
+refs/heads/try: 1c39fda0eaeb2f0e7bf37f0cac3541fb0cbc285f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/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) }

branches/try/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] = [];

branches/try/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);
           }

branches/try/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

branches/try/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
         })
     };