Convert alt to match. Stop parsing alt

17 files changed, 73 insertions, 73 deletions

diff --git a/src/rustdoc/astsrv.rs b/src/rustdoc/astsrv.rs
index 58341e2152d..655587b165d 100644
--- a/src/rustdoc/astsrv.rs
+++ b/src/rustdoc/astsrv.rs
@@ -77,7 +77,7 @@ fn act(po: comm::port<msg>, source: ~str, parse: parser) {
 
     let mut keep_going = true;
     while keep_going {
-        alt comm::recv(po) {
+        match comm::recv(po) {
           handle_request(f) => {
             f(ctxt);
           }
diff --git a/src/rustdoc/attr_parser.rs b/src/rustdoc/attr_parser.rs
index ba633111a6a..c590a1ac61e 100644
--- a/src/rustdoc/attr_parser.rs
+++ b/src/rustdoc/attr_parser.rs
@@ -93,7 +93,7 @@ fn should_not_extract_crate_name_if_no_name_value_in_link_attribute() {
 }
 
 fn parse_desc(attrs: ~[ast::attribute]) -> option<~str> {
-    alt doc_meta(attrs) {
+    match doc_meta(attrs) {
       some(meta) => {
         attr::get_meta_item_value_str(meta).map(|x| *x )
       }
@@ -118,9 +118,9 @@ fn parse_desc_should_parse_simple_doc_attributes() {
 }
 
 fn parse_hidden(attrs: ~[ast::attribute]) -> bool {
-    alt doc_meta(attrs) {
+    match doc_meta(attrs) {
       some(meta) => {
-        alt attr::get_meta_item_list(meta) {
+        match attr::get_meta_item_list(meta) {
           some(metas) => {
             let hiddens = attr::find_meta_items_by_name(metas, ~"hidden");
             vec::is_not_empty(hiddens)
diff --git a/src/rustdoc/attr_pass.rs b/src/rustdoc/attr_pass.rs
index 9c55ebc4a95..0a404ce1f51 100644
--- a/src/rustdoc/attr_pass.rs
+++ b/src/rustdoc/attr_pass.rs
@@ -93,7 +93,7 @@ fn parse_item_attrs<T:send>(
     id: doc::ast_id,
     +parse_attrs: fn~(~[ast::attribute]) -> T) -> T {
     do astsrv::exec(srv) |ctxt| {
-        let attrs = alt ctxt.ast_map.get(id) {
+        let attrs = match ctxt.ast_map.get(id) {
           ast_map::node_item(item, _) => item.attrs,
           ast_map::node_foreign_item(item, _, _) => item.attrs,
           _ => fail ~"parse_item_attrs: not an item"
@@ -144,7 +144,7 @@ fn fold_enum(
     {
         variants: do par::map(doc.variants) |variant| {
             let desc = do astsrv::exec(srv) |ctxt| {
-                alt check ctxt.ast_map.get(doc_id) {
+                match check ctxt.ast_map.get(doc_id) {
                   ast_map::node_item(@{
                     node: ast::item_enum(ast_variants, _), _
                   }, _) => {
@@ -201,12 +201,12 @@ fn merge_method_attrs(
 
     // Create an assoc list from method name to attributes
     let attrs: ~[(~str, option<~str>)] = do astsrv::exec(srv) |ctxt| {
-        alt ctxt.ast_map.get(item_id) {
+        match ctxt.ast_map.get(item_id) {
           ast_map::node_item(@{
             node: ast::item_trait(_, _, methods), _
           }, _) => {
             vec::map(methods, |method| {
-                alt method {
+                match method {
                   ast::required(ty_m) => {
                     (*ty_m.ident, attr_parser::parse_desc(ty_m.attrs))
                   }
diff --git a/src/rustdoc/config.rs b/src/rustdoc/config.rs
index 398892d715f..9a03a3e4455 100644
--- a/src/rustdoc/config.rs
+++ b/src/rustdoc/config.rs
@@ -100,7 +100,7 @@ fn parse_config_(
 ) -> result<config, ~str> {
     let args = vec::tail(args);
     let opts = vec::unzip(opts()).first();
-    alt getopts::getopts(args, opts) {
+    match getopts::getopts(args, opts) {
         result::ok(matches) => {
             if vec::len(matches.free) == 1u {
                 let input_crate = vec::head(matches.free);
@@ -176,7 +176,7 @@ fn config_from_opts(
 }
 
 fn parse_output_format(output_format: ~str) -> result<output_format, ~str> {
-    alt output_format {
+    match output_format {
       ~"markdown" => result::ok(markdown),
       ~"html" => result::ok(pandoc_html),
       _ => result::err(fmt!{"unknown output format '%s'", output_format})
@@ -184,7 +184,7 @@ fn parse_output_format(output_format: ~str) -> result<output_format, ~str> {
 }
 
 fn parse_output_style(output_style: ~str) -> result<output_style, ~str> {
-    alt output_style {
+    match output_style {
       ~"doc-per-crate" => result::ok(doc_per_crate),
       ~"doc-per-mod" => result::ok(doc_per_mod),
       _ => result::err(fmt!{"unknown output style '%s'", output_style})
@@ -200,10 +200,10 @@ fn maybe_find_pandoc(
         return result::ok(maybe_pandoc_cmd);
     }
 
-    let possible_pandocs = alt maybe_pandoc_cmd {
+    let possible_pandocs = match maybe_pandoc_cmd {
       some(pandoc_cmd) => ~[pandoc_cmd],
       none => {
-        ~[~"pandoc"] + alt os::homedir() {
+        ~[~"pandoc"] + match os::homedir() {
           some(dir) => {
             ~[path::connect(dir, ~".cabal/bin/pandoc")]
           }
diff --git a/src/rustdoc/desc_to_brief_pass.rs b/src/rustdoc/desc_to_brief_pass.rs
index 76c74c71ef4..661eb3f879e 100644
--- a/src/rustdoc/desc_to_brief_pass.rs
+++ b/src/rustdoc/desc_to_brief_pass.rs
@@ -104,7 +104,7 @@ fn parse_desc(desc: ~str) -> option<~str> {
 
     const max_brief_len: uint = 120u;
 
-    alt first_sentence(desc) {
+    match first_sentence(desc) {
       some(first_sentence) => {
         if str::len(first_sentence) <= max_brief_len {
             some(first_sentence)
@@ -143,7 +143,7 @@ fn first_sentence_(s: ~str) -> ~str {
             }
         }
     };
-    alt idx {
+    match idx {
       some(idx) if idx > 2u => {
         str::slice(s, 0u, idx - 1u)
       }
diff --git a/src/rustdoc/doc.rs b/src/rustdoc/doc.rs
index 723bcff5fb0..6fb1faa4483 100644
--- a/src/rustdoc/doc.rs
+++ b/src/rustdoc/doc.rs
@@ -141,7 +141,7 @@ type index_entry = {
 impl util for doc {
     fn cratedoc() -> cratedoc {
         option::get(vec::foldl(none, self.pages, |_m, page| {
-            alt page {
+            match page {
               doc::cratepage(doc) => some(doc),
               _ => none
             }
@@ -158,7 +158,7 @@ impl util for moddoc {
 
     fn mods() -> ~[moddoc] {
         do vec::filter_map(self.items) |itemtag| {
-            alt itemtag {
+            match itemtag {
               modtag(moddoc) => some(moddoc),
               _ => none
             }
@@ -167,7 +167,7 @@ impl util for moddoc {
 
     fn nmods() -> ~[nmoddoc] {
         do vec::filter_map(self.items) |itemtag| {
-            alt itemtag {
+            match itemtag {
               nmodtag(nmoddoc) => some(nmoddoc),
               _ => none
             }
@@ -176,7 +176,7 @@ impl util for moddoc {
 
     fn fns() -> ~[fndoc] {
         do vec::filter_map(self.items) |itemtag| {
-            alt itemtag {
+            match itemtag {
               fntag(fndoc) => some(fndoc),
               _ => none
             }
@@ -185,7 +185,7 @@ impl util for moddoc {
 
     fn consts() -> ~[constdoc] {
         do vec::filter_map(self.items) |itemtag| {
-            alt itemtag {
+            match itemtag {
               consttag(constdoc) => some(constdoc),
               _ => none
             }
@@ -194,7 +194,7 @@ impl util for moddoc {
 
     fn enums() -> ~[enumdoc] {
         do vec::filter_map(self.items) |itemtag| {
-            alt itemtag {
+            match itemtag {
               enumtag(enumdoc) => some(enumdoc),
               _ => none
             }
@@ -203,7 +203,7 @@ impl util for moddoc {
 
     fn traits() -> ~[traitdoc] {
         do vec::filter_map(self.items) |itemtag| {
-            alt itemtag {
+            match itemtag {
               traittag(traitdoc) => some(traitdoc),
               _ => none
             }
@@ -212,7 +212,7 @@ impl util for moddoc {
 
     fn impls() -> ~[impldoc] {
         do vec::filter_map(self.items) |itemtag| {
-            alt itemtag {
+            match itemtag {
               impltag(impldoc) => some(impldoc),
               _ => none
             }
@@ -221,7 +221,7 @@ impl util for moddoc {
 
     fn types() -> ~[tydoc] {
         do vec::filter_map(self.items) |itemtag| {
-            alt itemtag {
+            match itemtag {
               tytag(tydoc) => some(tydoc),
               _ => none
             }
@@ -244,7 +244,7 @@ impl util of page_utils for ~[page] {
 
     fn mods() -> ~[moddoc] {
         do vec::filter_map(self) |page| {
-            alt page {
+            match page {
               itempage(modtag(moddoc)) => some(moddoc),
               _ => none
             }
@@ -253,7 +253,7 @@ impl util of page_utils for ~[page] {
 
     fn nmods() -> ~[nmoddoc] {
         do vec::filter_map(self) |page| {
-            alt page {
+            match page {
               itempage(nmodtag(nmoddoc)) => some(nmoddoc),
               _ => none
             }
@@ -262,7 +262,7 @@ impl util of page_utils for ~[page] {
 
     fn fns() -> ~[fndoc] {
         do vec::filter_map(self) |page| {
-            alt page {
+            match page {
               itempage(fntag(fndoc)) => some(fndoc),
               _ => none
             }
@@ -271,7 +271,7 @@ impl util of page_utils for ~[page] {
 
     fn consts() -> ~[constdoc] {
         do vec::filter_map(self) |page| {
-            alt page {
+            match page {
               itempage(consttag(constdoc)) => some(constdoc),
               _ => none
             }
@@ -280,7 +280,7 @@ impl util of page_utils for ~[page] {
 
     fn enums() -> ~[enumdoc] {
         do vec::filter_map(self) |page| {
-            alt page {
+            match page {
               itempage(enumtag(enumdoc)) => some(enumdoc),
               _ => none
             }
@@ -289,7 +289,7 @@ impl util of page_utils for ~[page] {
 
     fn traits() -> ~[traitdoc] {
         do vec::filter_map(self) |page| {
-            alt page {
+            match page {
               itempage(traittag(traitdoc)) => some(traitdoc),
               _ => none
             }
@@ -298,7 +298,7 @@ impl util of page_utils for ~[page] {
 
     fn impls() -> ~[impldoc] {
         do vec::filter_map(self) |page| {
-            alt page {
+            match page {
               itempage(impltag(impldoc)) => some(impldoc),
               _ => none
             }
@@ -307,7 +307,7 @@ impl util of page_utils for ~[page] {
 
     fn types() -> ~[tydoc] {
         do vec::filter_map(self) |page| {
-            alt page {
+            match page {
               itempage(tytag(tydoc)) => some(tydoc),
               _ => none
             }
@@ -321,7 +321,7 @@ trait item {
 
 impl of item for itemtag {
     pure fn item() -> itemdoc {
-        alt self {
+        match self {
           doc::modtag(doc) => doc.item,
           doc::nmodtag(doc) => doc.item,
           doc::fntag(doc) => doc.item,
diff --git a/src/rustdoc/extract.rs b/src/rustdoc/extract.rs
index 7d56efcc4ee..b8be338bffd 100644
--- a/src/rustdoc/extract.rs
+++ b/src/rustdoc/extract.rs
@@ -58,7 +58,7 @@ fn moddoc_from_mod(
         item: itemdoc,
         items: do vec::filter_map(module_.items) |item| {
             let itemdoc = mk_itemdoc(item.id, item.ident);
-            alt item.node {
+            match item.node {
               ast::item_mod(m) => {
                 some(doc::modtag(
                     moddoc_from_mod(itemdoc, m)
@@ -114,7 +114,7 @@ fn nmoddoc_from_mod(
         item: itemdoc,
         fns: do vec::map(module_.items) |item| {
             let itemdoc = mk_itemdoc(item.id, item.ident);
-            alt item.node {
+            match item.node {
               ast::foreign_item_fn(_, _) => {
                 fndoc_from_fn(itemdoc)
               }
@@ -189,7 +189,7 @@ fn traitdoc_from_trait(
     {
         item: itemdoc,
         methods: do vec::map(methods) |method| {
-            alt method {
+            match method {
               ast::required(ty_m) => {
                 {
                     name: *ty_m.ident,
diff --git a/src/rustdoc/fold.rs b/src/rustdoc/fold.rs
index b848c6b8899..45d4882a87b 100644
--- a/src/rustdoc/fold.rs
+++ b/src/rustdoc/fold.rs
@@ -134,7 +134,7 @@ fn default_par_fold<T:send copy>(ctxt: T) -> fold<T> {
 fn default_seq_fold_doc<T>(fold: fold<T>, doc: doc::doc) -> doc::doc {
     doc::doc_({
         pages: do vec::map(doc.pages) |page| {
-            alt page {
+            match page {
               doc::cratepage(doc) => {
                 doc::cratepage(fold.fold_crate(fold, doc))
               }
@@ -242,7 +242,7 @@ fn default_par_fold_nmod<T:send copy>(
 }
 
 fn fold_itemtag<T>(fold: fold<T>, doc: doc::itemtag) -> doc::itemtag {
-    alt doc {
+    match doc {
       doc::modtag(moddoc) => {
         doc::modtag(fold.fold_mod(fold, moddoc))
       }
diff --git a/src/rustdoc/markdown_index_pass.rs b/src/rustdoc/markdown_index_pass.rs
index 123ad89ecd4..9a58d0c9179 100644
--- a/src/rustdoc/markdown_index_pass.rs
+++ b/src/rustdoc/markdown_index_pass.rs
@@ -78,7 +78,7 @@ fn item_to_entry(
     doc: doc::itemtag,
     config: config::config
 ) -> doc::index_entry {
-    let link = alt doc {
+    let link = match doc {
       doc::modtag(_) | doc::nmodtag(_)
       if config.output_style == config::doc_per_mod => {
         markdown_writer::make_filename(config, doc::itempage(doc))
diff --git a/src/rustdoc/markdown_pass.rs b/src/rustdoc/markdown_pass.rs
index 90d00d292b1..dbba57960c0 100644
--- a/src/rustdoc/markdown_pass.rs
+++ b/src/rustdoc/markdown_pass.rs
@@ -28,7 +28,7 @@ fn run(
 
     pure fn mods_last(item1: &doc::itemtag, item2: &doc::itemtag) -> bool {
         pure fn is_mod(item: &doc::itemtag) -> bool {
-            alt *item {
+            match *item {
               doc::modtag(_) => true,
               _ => false
             }
@@ -94,7 +94,7 @@ fn write_markdown(
 
 fn write_page(ctxt: ctxt, page: doc::page) {
     write_title(ctxt, page);
-    alt page {
+    match page {
       doc::cratepage(doc) => {
         write_crate(ctxt, doc);
       }
@@ -128,7 +128,7 @@ fn write_title(ctxt: ctxt, page: doc::page) {
 }
 
 fn make_title(page: doc::page) -> ~str {
-    let item = alt page {
+    let item = match page {
       doc::cratepage(cratedoc) => {
         doc::modtag(cratedoc.topmod)
       }
@@ -150,7 +150,7 @@ fn should_write_title_for_each_page() {
     write_markdown(doc, writer_factory);
     for iter::repeat(2u) {
         let (page, markdown) = comm::recv(po);
-        alt page {
+        match page {
           doc::cratepage(_) => {
             assert str::contains(markdown, ~"% Crate core");
           }
@@ -180,7 +180,7 @@ fn write_header_(ctxt: ctxt, lvl: hlvl, title: ~str) {
 }
 
 fn header_kind(doc: doc::itemtag) -> ~str {
-    alt doc {
+    match doc {
       doc::modtag(_) => {
         if doc.id() == syntax::ast::crate_node_id {
             ~"Crate"
@@ -214,7 +214,7 @@ fn header_kind(doc: doc::itemtag) -> ~str {
 
 fn header_name(doc: doc::itemtag) -> ~str {
     let fullpath = str::connect(doc.path() + ~[doc.name()], ~"::");
-    alt doc {
+    match doc {
       doc::modtag(_) if doc.id() != syntax::ast::crate_node_id => {
         fullpath
       }
@@ -289,7 +289,7 @@ fn write_desc(
     ctxt: ctxt,
     desc: option<~str>
 ) {
-    alt desc {
+    match desc {
         some(desc) => {
             ctxt.w.write_line(desc);
             ctxt.w.write_line(~"");
@@ -347,7 +347,7 @@ fn write_item_(ctxt: ctxt, doc: doc::itemtag, write_header: bool) {
         write_item_header(ctxt, doc);
     }
 
-    alt doc {
+    match doc {
       doc::modtag(moddoc) => write_mod(ctxt, moddoc),
       doc::nmodtag(nmoddoc) => write_nmod(ctxt, nmoddoc),
       doc::fntag(fndoc) => write_fn(ctxt, fndoc),
@@ -364,7 +364,7 @@ fn write_item_header(ctxt: ctxt, doc: doc::itemtag) {
 }
 
 fn item_header_lvl(doc: doc::itemtag) -> hlvl {
-    alt doc {
+    match doc {
       doc::modtag(_) | doc::nmodtag(_) => h1,
       _ => h2
     }
@@ -481,7 +481,7 @@ fn write_fnlike(
 }
 
 fn write_sig(ctxt: ctxt, sig: option<~str>) {
-    alt sig {
+    match sig {
       some(sig) => {
         ctxt.w.write_line(code_block_indent(sig));
         ctxt.w.write_line(~"");
@@ -602,7 +602,7 @@ fn write_variants(
 fn write_variant(ctxt: ctxt, doc: doc::variantdoc) {
     assert option::is_some(doc.sig);
     let sig = option::get(doc.sig);
-    alt doc.desc {
+    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 3f46f8f3d5b..a3b40a1caaa 100644
--- a/src/rustdoc/markdown_writer.rs
+++ b/src/rustdoc/markdown_writer.rs
@@ -38,7 +38,7 @@ impl writer_util of writer_utils for writer {
 }
 
 fn make_writer_factory(config: config::config) -> writer_factory {
-    alt config.output_format {
+    match config.output_format {
       config::markdown => {
         markdown_writer_factory(config)
       }
@@ -150,7 +150,7 @@ fn generic_writer(+process: fn~(markdown: ~str)) -> writer {
         let mut markdown = ~"";
         let mut keep_going = true;
         while keep_going {
-            alt comm::recv(po) {
+            match comm::recv(po) {
               write(s) => markdown += s,
               done => keep_going = false
             }
@@ -176,7 +176,7 @@ fn make_filename(
     page: doc::page
 ) -> ~str {
     let filename = {
-        alt page {
+        match page {
           doc::cratepage(doc) => {
             if config.output_format == config::pandoc_html &&
                 config.output_style == config::doc_per_mod {
@@ -191,7 +191,7 @@ fn make_filename(
           }
         }
     };
-    let ext = alt config.output_format {
+    let ext = match config.output_format {
       config::markdown => ~"md",
       config::pandoc_html => ~"html"
     };
@@ -256,7 +256,7 @@ mod test {
 fn write_file(path: ~str, s: ~str) {
     import io::writer_util;
 
-    alt io::file_writer(path, ~[io::create, io::truncate]) {
+    match io::file_writer(path, ~[io::create, io::truncate]) {
       result::ok(writer) => {
         writer.write_str(s);
       }
@@ -292,7 +292,7 @@ fn future_writer() -> (writer, future::future<~str>) {
     let future = do future::from_fn {
         let mut res = ~"";
         loop {
-            alt comm::recv(port) {
+            match comm::recv(port) {
               write(s) => res += s,
               done => break
             }
diff --git a/src/rustdoc/page_pass.rs b/src/rustdoc/page_pass.rs
index 11cf4f735cf..09543ae59ca 100644
--- a/src/rustdoc/page_pass.rs
+++ b/src/rustdoc/page_pass.rs
@@ -106,7 +106,7 @@ fn fold_mod(
 fn strip_mod(doc: doc::moddoc) -> doc::moddoc {
     doc::moddoc_({
         items: do vec::filter(doc.items) |item| {
-            alt item {
+            match item {
               doc::modtag(_) => false,
               doc::nmodtag(_) => false,
               _ => true
diff --git a/src/rustdoc/prune_hidden_pass.rs b/src/rustdoc/prune_hidden_pass.rs
index d8060257a63..970c081903a 100644
--- a/src/rustdoc/prune_hidden_pass.rs
+++ b/src/rustdoc/prune_hidden_pass.rs
@@ -38,7 +38,7 @@ fn is_hidden(srv: astsrv::srv, doc: doc::itemdoc) -> bool {
 
     let id = doc.id;
     do astsrv::exec(srv) |ctxt| {
-        let attrs = alt ctxt.ast_map.get(id) {
+        let attrs = match ctxt.ast_map.get(id) {
           ast_map::node_item(item, _) => item.attrs,
           _ => ~[]
         };
diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs
index 015da4b52d8..eb6c88c62e7 100755
--- a/src/rustdoc/rustdoc.rs
+++ b/src/rustdoc/rustdoc.rs
@@ -107,7 +107,7 @@ fn main(args: ~[~str]) {
         return;
     }
 
-    let config = alt config::parse_config(args) {
+    let config = match config::parse_config(args) {
       result::ok(config) => config,
       result::err(err) => {
         io::println(fmt!{"error: %s", err});
diff --git a/src/rustdoc/sectionalize_pass.rs b/src/rustdoc/sectionalize_pass.rs
index 29bebdf10e5..0ff86ecbcbe 100644
--- a/src/rustdoc/sectionalize_pass.rs
+++ b/src/rustdoc/sectionalize_pass.rs
@@ -95,7 +95,7 @@ fn sectionalize(desc: option<~str>) -> (option<~str>, ~[doc::section]) {
     let mut sections = ~[];
 
     for lines.each |line| {
-        alt parse_header(line) {
+        match parse_header(line) {
           some(header) => {
             if option::is_some(current_section) {
                 sections += ~[option::get(current_section)];
@@ -106,7 +106,7 @@ fn sectionalize(desc: option<~str>) -> (option<~str>, ~[doc::section]) {
             });
           }
           none => {
-            alt copy current_section {
+            match copy current_section {
               some(section) => {
                 current_section = some({
                     body: section.body + ~"\n" + line
@@ -114,7 +114,7 @@ fn sectionalize(desc: option<~str>) -> (option<~str>, ~[doc::section]) {
                 });
               }
               none => {
-                new_desc = alt new_desc {
+                new_desc = match new_desc {
                   some(desc) => {
                     some(desc + ~"\n" + line)
                   }
diff --git a/src/rustdoc/sort_item_type_pass.rs b/src/rustdoc/sort_item_type_pass.rs
index afa299345dc..1d619f0a8f1 100644
--- a/src/rustdoc/sort_item_type_pass.rs
+++ b/src/rustdoc/sort_item_type_pass.rs
@@ -7,7 +7,7 @@ export mk_pass;
 fn mk_pass() -> pass {
     pure fn by_score(item1: &doc::itemtag, item2: &doc::itemtag) -> bool {
         pure fn score(item: &doc::itemtag) -> int {
-            alt *item {
+            match *item {
               doc::consttag(_) => 0,
               doc::tytag(_) => 1,
               doc::enumtag(_) => 2,
diff --git a/src/rustdoc/tystr_pass.rs b/src/rustdoc/tystr_pass.rs
index a2ae6d5eba4..ba3b9f74ab3 100644
--- a/src/rustdoc/tystr_pass.rs
+++ b/src/rustdoc/tystr_pass.rs
@@ -46,7 +46,7 @@ fn fold_fn(
 
 fn get_fn_sig(srv: astsrv::srv, fn_id: doc::ast_id) -> option<~str> {
     do astsrv::exec(srv) |ctxt| {
-        alt check ctxt.ast_map.get(fn_id) {
+        match check ctxt.ast_map.get(fn_id) {
           ast_map::node_item(@{
             ident: ident,
             node: ast::item_fn(decl, tys, _), _
@@ -81,7 +81,7 @@ fn fold_const(
 
     {
         sig: some(do astsrv::exec(srv) |ctxt| {
-            alt check ctxt.ast_map.get(doc.id()) {
+            match check ctxt.ast_map.get(doc.id()) {
               ast_map::node_item(@{
                 node: ast::item_const(ty, _), _
               }, _) => {
@@ -109,7 +109,7 @@ fn fold_enum(
     {
         variants: do par::map(doc.variants) |variant| {
             let sig = do astsrv::exec(srv) |ctxt| {
-                alt check ctxt.ast_map.get(doc_id) {
+                match check ctxt.ast_map.get(doc_id) {
                   ast_map::node_item(@{
                     node: ast::item_enum(ast_variants, _), _
                   }, _) => {
@@ -167,18 +167,18 @@ fn get_method_sig(
     method_name: ~str
 ) -> option<~str> {
     do astsrv::exec(srv) |ctxt| {
-        alt check ctxt.ast_map.get(item_id) {
+        match check ctxt.ast_map.get(item_id) {
           ast_map::node_item(@{
             node: ast::item_trait(_, _, methods), _
           }, _) => {
-            alt check vec::find(methods, |method| {
-                alt method {
+            match check vec::find(methods, |method| {
+                match method {
                   ast::required(ty_m) => *ty_m.ident == method_name,
                   ast::provided(m) => *m.ident == method_name,
                 }
             }) {
                 some(method) => {
-                  alt method {
+                  match method {
                     ast::required(ty_m) => {
                       some(pprust::fun_to_str(
                           ty_m.decl,
@@ -200,7 +200,7 @@ fn get_method_sig(
           ast_map::node_item(@{
             node: ast::item_impl(_, _, _, methods), _
           }, _) => {
-            alt check vec::find(methods, |method| {
+            match check vec::find(methods, |method| {
                 *method.ident == method_name
             }) {
                 some(method) => {
@@ -231,7 +231,7 @@ fn fold_impl(
     let srv = fold.ctxt;
 
     let (trait_types, self_ty) = do astsrv::exec(srv) |ctxt| {
-        alt ctxt.ast_map.get(doc.id()) {
+        match ctxt.ast_map.get(doc.id()) {
           ast_map::node_item(@{
             node: ast::item_impl(_, trait_types, self_ty, _), _
           }, _) => {
@@ -286,7 +286,7 @@ fn fold_type(
 
     {
         sig: do astsrv::exec(srv) |ctxt| {
-            alt ctxt.ast_map.get(doc.id()) {
+            match ctxt.ast_map.get(doc.id()) {
               ast_map::node_item(@{
                 ident: ident,
                 node: ast::item_ty(ty, params), _