option: rm functions that duplicate methods

3 files changed, 5 insertions, 10 deletions

diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs
index eed36e16754..24360734520 100644
--- a/src/libsyntax/diagnostic.rs
+++ b/src/libsyntax/diagnostic.rs
@@ -15,7 +15,6 @@ use codemap;
 
 use core::io::WriterUtil;
 use core::io;
-use core::option;
 use core::str;
 use core::vec;
 
@@ -294,8 +293,7 @@ fn highlight_lines(cm: @codemap::CodeMap,
 
 fn print_macro_backtrace(cm: @codemap::CodeMap, sp: span) {
     for sp.expn_info.each |ei| {
-        let ss = option::map_default(&ei.callee.span, @~"",
-                                     |span| @cm.span_to_str(*span));
+        let ss = ei.callee.span.map_default(@~"", |span| @cm.span_to_str(*span));
         print_diagnostic(*ss, note,
                          fmt!("in expansion of %s!", ei.callee.name));
         let ss = cm.span_to_str(ei.call_site);
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index fb9d96a7831..07ed6b7dfe2 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -22,7 +22,6 @@ use fold::*;
 use parse;
 use parse::{parser, parse_item_from_source_str, new_parser_from_tts};
 
-use core::option;
 use core::vec;
 
 pub fn expand_expr(extsbox: @mut SyntaxEnv,
@@ -294,8 +293,7 @@ pub fn expand_item_mac(+extsbox: @mut SyntaxEnv,
         MRExpr(_) => cx.span_fatal(pth.span,
                                     ~"expr macro in item position: "
                                     + *extname),
-        MRAny(_, item_maker, _) =>
-            option::chain(item_maker(), |i| {fld.fold_item(i)}),
+        MRAny(_, item_maker, _) => item_maker().chain(|i| {fld.fold_item(i)}),
         MRDef(ref mdef) => {
             extsbox.insert(@/*bad*/ copy mdef.name, @SE((*mdef).ext));
             None
diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs
index 159b23f4f99..b3974acc674 100644
--- a/src/libsyntax/fold.rs
+++ b/src/libsyntax/fold.rs
@@ -15,7 +15,6 @@ use ast;
 use codemap::{span, spanned};
 use opt_vec::OptVec;
 
-use core::option;
 use core::vec;
 
 pub trait ast_fold {
@@ -298,7 +297,7 @@ pub fn noop_fold_item_underscore(i: &item_, fld: @ast_fold) -> item_ {
 
 fn fold_struct_def(struct_def: @ast::struct_def, fld: @ast_fold)
                 -> @ast::struct_def {
-    let dtor = do option::map(&struct_def.dtor) |dtor| {
+    let dtor = do struct_def.dtor.map |dtor| {
         let dtor_body = fld.fold_block(&dtor.node.body);
         let dtor_id   = fld.new_id(dtor.node.id);
         spanned {
@@ -663,7 +662,7 @@ fn noop_fold_variant(v: &variant_, fld: @ast_fold) -> variant_ {
             })
         }
         struct_variant_kind(struct_def) => {
-            let dtor = do option::map(&struct_def.dtor) |dtor| {
+            let dtor = do struct_def.dtor.map |dtor| {
                 let dtor_body = fld.fold_block(&dtor.node.body);
                 let dtor_id   = fld.new_id(dtor.node.id);
                 spanned {
@@ -679,7 +678,7 @@ fn noop_fold_variant(v: &variant_, fld: @ast_fold) -> variant_ {
                 fields: vec::map(struct_def.fields,
                                  |f| fld.fold_struct_field(*f)),
                 dtor: dtor,
-                ctor_id: option::map(&struct_def.ctor_id, |c| fld.new_id(*c))
+                ctor_id: struct_def.ctor_id.map(|c| fld.new_id(*c))
             })
         }
         enum_variant_kind(ref enum_definition) => {