core: Demode option

11 files changed, 45 insertions, 45 deletions

diff --git a/src/rustdoc/attr_pass.rs b/src/rustdoc/attr_pass.rs
index a0a826ad547..b3ba7f14109 100644
--- a/src/rustdoc/attr_pass.rs
+++ b/src/rustdoc/attr_pass.rs
@@ -52,7 +52,7 @@ fn fold_crate(
     {
         topmod: doc::ModDoc_({
             item: {
-                name: option::get_default(attrs.name, doc.topmod.name()),
+                name: option::get_default(&attrs.name, doc.topmod.name()),
                 .. doc.topmod.item
             },
             .. *doc.topmod
@@ -150,7 +150,7 @@ fn fold_enum(
                     node: ast::item_enum(enum_definition, _), _
                   }, _) => {
                     let ast_variant = option::get(
-                        vec::find(enum_definition.variants, |v| {
+                        &vec::find(enum_definition.variants, |v| {
                             to_str(v.node.name) == variant.name
                         }));
 
diff --git a/src/rustdoc/config.rs b/src/rustdoc/config.rs
index 177482a5e93..383b002110a 100644
--- a/src/rustdoc/config.rs
+++ b/src/rustdoc/config.rs
@@ -159,16 +159,16 @@ fn config_from_opts(
     let result = result::Ok(config);
     let result = do result::chain(result) |config| {
         let output_dir = getopts::opt_maybe_str(matches, opt_output_dir());
-        let output_dir = option::map(output_dir, |s| Path(s));
+        let output_dir = output_dir.map(|s| Path(s));
         result::Ok({
-            output_dir: option::get_default(output_dir, config.output_dir),
+            output_dir: output_dir.get_default(config.output_dir),
             .. config
         })
     };
     let result = do result::chain(result) |config| {
         let output_format = getopts::opt_maybe_str(
             matches, opt_output_format());
-        do option::map_default(output_format, result::Ok(config))
+        do output_format.map_default(result::Ok(config))
             |output_format| {
             do result::chain(parse_output_format(output_format))
                 |output_format| {
@@ -183,7 +183,7 @@ fn config_from_opts(
     let result = do result::chain(result) |config| {
         let output_style =
             getopts::opt_maybe_str(matches, opt_output_style());
-        do option::map_default(output_style, result::Ok(config))
+        do output_style.map_default(result::Ok(config))
             |output_style| {
             do result::chain(parse_output_style(output_style))
                 |output_style| {
@@ -251,7 +251,7 @@ fn maybe_find_pandoc(
         output.status == 0
     };
 
-    if option::is_some(pandoc) {
+    if pandoc.is_some() {
         result::Ok(pandoc)
     } else {
         result::Err(~"couldn't find pandoc")
diff --git a/src/rustdoc/desc_to_brief_pass.rs b/src/rustdoc/desc_to_brief_pass.rs
index a1d365506ae..b517c2f2409 100644
--- a/src/rustdoc/desc_to_brief_pass.rs
+++ b/src/rustdoc/desc_to_brief_pass.rs
@@ -94,11 +94,11 @@ mod test {
 }
 
 fn extract(desc: Option<~str>) -> Option<~str> {
-    if option::is_none(desc) {
+    if desc.is_none() {
         return None
     }
 
-    parse_desc(option::get(desc))
+    parse_desc(desc.get())
 }
 
 fn parse_desc(desc: ~str) -> Option<~str> {
diff --git a/src/rustdoc/doc.rs b/src/rustdoc/doc.rs
index 126ea10c301..a9426ee9ffd 100644
--- a/src/rustdoc/doc.rs
+++ b/src/rustdoc/doc.rs
@@ -635,7 +635,7 @@ impl IndexEntry : cmp::Eq {
 
 impl Doc {
     fn CrateDoc() -> CrateDoc {
-        option::get(vec::foldl(None, self.pages, |_m, page| {
+        option::get(&vec::foldl(None, self.pages, |_m, page| {
             match page {
               doc::CratePage(doc) => Some(doc),
               _ => None
diff --git a/src/rustdoc/markdown_index_pass.rs b/src/rustdoc/markdown_index_pass.rs
index cf97308fd0e..e8b8bd1a9fd 100644
--- a/src/rustdoc/markdown_index_pass.rs
+++ b/src/rustdoc/markdown_index_pass.rs
@@ -152,13 +152,13 @@ fn should_index_mod_contents() {
         config::DocPerCrate,
         ~"mod a { } fn b() { }"
     );
-    assert option::get(doc.cratemod().index).entries[0] == {
+    assert doc.cratemod().index.get().entries[0] == {
         kind: ~"Module",
         name: ~"a",
         brief: None,
         link: ~"#module-a"
     };
-    assert option::get(doc.cratemod().index).entries[1] == {
+    assert doc.cratemod().index.get().entries[1] == {
         kind: ~"Function",
         name: ~"b",
         brief: None,
@@ -172,13 +172,13 @@ fn should_index_mod_contents_multi_page() {
         config::DocPerMod,
         ~"mod a { } fn b() { }"
     );
-    assert option::get(doc.cratemod().index).entries[0] == {
+    assert doc.cratemod().index.get().entries[0] == {
         kind: ~"Module",
         name: ~"a",
         brief: None,
         link: ~"a.html"
     };
-    assert option::get(doc.cratemod().index).entries[1] == {
+    assert doc.cratemod().index.get().entries[1] == {
         kind: ~"Function",
         name: ~"b",
         brief: None,
@@ -192,7 +192,7 @@ fn should_index_foreign_mod_pages() {
         config::DocPerMod,
         ~"extern mod a { }"
     );
-    assert option::get(doc.cratemod().index).entries[0] == {
+    assert doc.cratemod().index.get().entries[0] == {
         kind: ~"Foreign module",
         name: ~"a",
         brief: None,
@@ -206,7 +206,7 @@ fn should_add_brief_desc_to_index() {
         config::DocPerMod,
         ~"#[doc = \"test\"] mod a { }"
     );
-    assert option::get(doc.cratemod().index).entries[0].brief
+    assert doc.cratemod().index.get().entries[0].brief
         == Some(~"test");
 }
 
@@ -216,7 +216,7 @@ fn should_index_foreign_mod_contents() {
         config::DocPerCrate,
         ~"extern mod a { fn b(); }"
     );
-    assert option::get(doc.cratemod().nmods()[0].index).entries[0] == {
+    assert doc.cratemod().nmods()[0].index.get().entries[0] == {
         kind: ~"Function",
         name: ~"b",
         brief: None,
diff --git a/src/rustdoc/markdown_pass.rs b/src/rustdoc/markdown_pass.rs
index c5319fc9cf8..924e4be6305 100644
--- a/src/rustdoc/markdown_pass.rs
+++ b/src/rustdoc/markdown_pass.rs
@@ -66,10 +66,10 @@ fn should_write_modules_last() {
          fn d() { }"
     );
 
-    let idx_a = option::get(str::find_str(markdown, ~"# Module `a`"));
-    let idx_b = option::get(str::find_str(markdown, ~"## Function `b`"));
-    let idx_c = option::get(str::find_str(markdown, ~"# Module `c`"));
-    let idx_d = option::get(str::find_str(markdown, ~"## Function `d`"));
+    let idx_a = str::find_str(markdown, ~"# Module `a`").get();
+    let idx_b = str::find_str(markdown, ~"## Function `b`").get();
+    let idx_c = str::find_str(markdown, ~"# Module `c`").get();
+    let idx_d = str::find_str(markdown, ~"## Function `d`").get();
 
     assert idx_b < idx_d;
     assert idx_d < idx_a;
@@ -227,8 +227,8 @@ fn header_name(doc: doc::ItemTag) -> ~str {
         fullpath
       }
       doc::ImplTag(doc) => {
-        assert option::is_some(doc.self_ty);
-        let self_ty = option::get(doc.self_ty);
+        assert doc.self_ty.is_some();
+        let self_ty = doc.self_ty.get();
         let mut trait_part = ~"";
         for doc.trait_types.eachi |i, trait_type| {
             if i == 0 {
@@ -345,8 +345,8 @@ fn write_mod_contents(
     doc: doc::ModDoc
 ) {
     write_common(ctxt, doc.desc(), doc.sections());
-    if option::is_some(doc.index) {
-        write_index(ctxt, option::get(doc.index));
+    if doc.index.is_some() {
+        write_index(ctxt, doc.index.get());
     }
 
     for doc.items.each |itemTag| {
@@ -405,9 +405,9 @@ fn write_index(ctxt: Ctxt, index: doc::Index) {
     for index.entries.each |entry| {
         let header = header_text_(entry.kind, entry.name);
         let id = entry.link;
-        if option::is_some(entry.brief) {
+        if entry.brief.is_some() {
             ctxt.w.write_line(fmt!("* [%s](%s) - %s",
-                                   header, id, option::get(entry.brief)));
+                                   header, id, entry.brief.get()));
         } else {
             ctxt.w.write_line(fmt!("* [%s](%s)", header, id));
         }
@@ -448,8 +448,8 @@ fn should_write_index_for_foreign_mods() {
 
 fn write_nmod(ctxt: Ctxt, doc: doc::NmodDoc) {
     write_common(ctxt, doc.desc(), doc.sections());
-    if option::is_some(doc.index) {
-        write_index(ctxt, option::get(doc.index));
+    if doc.index.is_some() {
+        write_index(ctxt, doc.index.get());
     }
 
     for doc.fns.each |FnDoc| {
@@ -623,8 +623,8 @@ fn write_variants(
 }
 
 fn write_variant(ctxt: Ctxt, doc: doc::VariantDoc) {
-    assert option::is_some(doc.sig);
-    let sig = option::get(doc.sig);
+    assert doc.sig.is_some();
+    let sig = doc.sig.get();
     match doc.desc {
       Some(desc) => {
         ctxt.w.write_line(fmt!("* `%s` - %s", sig, desc));
diff --git a/src/rustdoc/markdown_writer.rs b/src/rustdoc/markdown_writer.rs
index 99849263067..d0fe7a3840b 100644
--- a/src/rustdoc/markdown_writer.rs
+++ b/src/rustdoc/markdown_writer.rs
@@ -74,8 +74,8 @@ fn pandoc_writer(
     config: config::Config,
     page: doc::Page
 ) -> Writer {
-    assert option::is_some(config.pandoc_cmd);
-    let pandoc_cmd = option::get(config.pandoc_cmd);
+    assert config.pandoc_cmd.is_some();
+    let pandoc_cmd = config.pandoc_cmd.get();
     let filename = make_local_filename(config, page);
 
     let pandoc_args = ~[
diff --git a/src/rustdoc/page_pass.rs b/src/rustdoc/page_pass.rs
index 48b57c7361d..8710792f0e4 100644
--- a/src/rustdoc/page_pass.rs
+++ b/src/rustdoc/page_pass.rs
@@ -45,7 +45,7 @@ fn make_doc_from_pages(page_port: PagePort) -> doc::Doc {
     let mut pages = ~[];
     loop {
         let val = comm::recv(page_port);
-        if option::is_some(val) {
+        if val.is_some() {
             pages += ~[option::unwrap(val)];
         } else {
             break;
diff --git a/src/rustdoc/sectionalize_pass.rs b/src/rustdoc/sectionalize_pass.rs
index 583817aef8b..2203707ed21 100644
--- a/src/rustdoc/sectionalize_pass.rs
+++ b/src/rustdoc/sectionalize_pass.rs
@@ -84,11 +84,11 @@ fn sectionalize(desc: Option<~str>) -> (Option<~str>, ~[doc::Section]) {
      * and remove each header and accompanying text into section records.
      */
 
-    if option::is_none(desc) {
+    if desc.is_none() {
         return (None, ~[]);
     }
 
-    let lines = str::lines(option::get(desc));
+    let lines = str::lines(desc.get());
 
     let mut new_desc = None::<~str>;
     let mut current_section = None;
@@ -97,8 +97,8 @@ fn sectionalize(desc: Option<~str>) -> (Option<~str>, ~[doc::Section]) {
     for lines.each |line| {
         match parse_header(*line) {
           Some(header) => {
-            if option::is_some(current_section) {
-                sections += ~[option::get(current_section)];
+            if current_section.is_some() {
+                sections += ~[current_section.get()];
             }
             current_section = Some({
                 header: header,
@@ -128,8 +128,8 @@ fn sectionalize(desc: Option<~str>) -> (Option<~str>, ~[doc::Section]) {
         }
     }
 
-    if option::is_some(current_section) {
-        sections += ~[option::get(current_section)];
+    if current_section.is_some() {
+        sections += ~[current_section.get()];
     }
 
     (new_desc, sections)
@@ -190,10 +190,10 @@ fn should_remove_section_text_from_main_desc() {
          mod a {
              #[legacy_exports]; }");
     assert !str::contains(
-        option::get(doc.cratemod().mods()[0].desc()),
+        doc.cratemod().mods()[0].desc().get(),
         ~"Header");
     assert !str::contains(
-        option::get(doc.cratemod().mods()[0].desc()),
+        doc.cratemod().mods()[0].desc().get(),
         ~"Body");
 }
 
diff --git a/src/rustdoc/text_pass.rs b/src/rustdoc/text_pass.rs
index daa67ff3b0e..76ae3192cef 100644
--- a/src/rustdoc/text_pass.rs
+++ b/src/rustdoc/text_pass.rs
@@ -32,7 +32,7 @@ fn run(
 }
 
 fn maybe_apply_op(op: Op, s: Option<~str>) -> Option<~str> {
-    option::map(s, |s| op(s) )
+    s.map(|s| op(s) )
 }
 
 fn fold_item(fold: fold::Fold<Op>, doc: doc::ItemDoc) -> doc::ItemDoc {
diff --git a/src/rustdoc/tystr_pass.rs b/src/rustdoc/tystr_pass.rs
index 97313e06caa..62db53b7600 100644
--- a/src/rustdoc/tystr_pass.rs
+++ b/src/rustdoc/tystr_pass.rs
@@ -117,10 +117,10 @@ fn fold_enum(
                   ast_map::node_item(@{
                     node: ast::item_enum(enum_definition, _), _
                   }, _) => {
-                    let ast_variant = option::get(
+                    let ast_variant =
                         do vec::find(enum_definition.variants) |v| {
                             to_str(v.node.name) == variant.name
-                        });
+                        }.get();
 
                     pprust::variant_to_str(ast_variant, extract::interner())
                   }