about summary refs log tree commit diff
path: root/src/librustsyntax/parse
diff options
context:
space:
mode:
authorTim Chevalier <chevalier@alum.wellesley.edu>2012-04-02 15:34:49 -0700
committerTim Chevalier <chevalier@alum.wellesley.edu>2012-04-02 16:12:49 -0700
commit21be1379d561b6679a8a2ea47dce88f948c5acca (patch)
tree25b911b9e5071d1512a3e5ff5d66b91716645c75 /src/librustsyntax/parse
parent987bc2362926d0672a01e8d5964940743df48cb6 (diff)
downloadrust-21be1379d561b6679a8a2ea47dce88f948c5acca.tar.gz
rust-21be1379d561b6679a8a2ea47dce88f948c5acca.zip
Rename some core::option functions
from_maybe => get_with_default
maybe => with_option
may => with_option_do

I know these names are kind of ridiculous, but it's the best I could think of.
Feel free to bikeshed. Closes #2081
Diffstat (limited to 'src/librustsyntax/parse')
-rw-r--r--src/librustsyntax/parse/eval.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustsyntax/parse/eval.rs b/src/librustsyntax/parse/eval.rs
index 42187ad9c7c..a9e0ce9845e 100644
--- a/src/librustsyntax/parse/eval.rs
+++ b/src/librustsyntax/parse/eval.rs
@@ -23,7 +23,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::from_maybe(suffix, "none"));
+           option::get_or_default(suffix, "none"));
     let (cview_items, citems, cattrs)
         = parse_companion_mod(cx, prefix, suffix);
     let mut view_items: [@ast::view_item] = [];