Convert ret to return

9 files changed, 19 insertions, 19 deletions

diff --git a/src/rustdoc/astsrv.rs b/src/rustdoc/astsrv.rs
index 5b7cc1df001..cd931578c32 100644
--- a/src/rustdoc/astsrv.rs
+++ b/src/rustdoc/astsrv.rs
@@ -64,7 +64,7 @@ fn run<T>(owner: srv_owner<T>, source: ~str, +parse: parser) -> T {
 
     let res = owner(srv_);
     comm::send(srv_.ch, exit);
-    ret res;
+    return res;
 }
 
 fn act(po: comm::port<msg>, source: ~str, parse: parser) {
diff --git a/src/rustdoc/config.rs b/src/rustdoc/config.rs
index c663806bf99..5300ebe1a3b 100644
--- a/src/rustdoc/config.rs
+++ b/src/rustdoc/config.rs
@@ -172,7 +172,7 @@ fn config_from_opts(
             })
         }
     };
-    ret result;
+    return result;
 }
 
 fn parse_output_format(output_format: ~str) -> result<output_format, ~str> {
@@ -197,7 +197,7 @@ fn maybe_find_pandoc(
     program_output: program_output
 ) -> result<option<~str>, ~str> {
     if config.output_format != pandoc_html {
-        ret result::ok(maybe_pandoc_cmd);
+        return result::ok(maybe_pandoc_cmd);
     }
 
     let possible_pandocs = alt maybe_pandoc_cmd {
diff --git a/src/rustdoc/desc_to_brief_pass.rs b/src/rustdoc/desc_to_brief_pass.rs
index c047530fec2..37a76f936d2 100644
--- a/src/rustdoc/desc_to_brief_pass.rs
+++ b/src/rustdoc/desc_to_brief_pass.rs
@@ -94,7 +94,7 @@ mod test {
 
 fn extract(desc: option<~str>) -> option<~str> {
     if option::is_none(desc) {
-        ret none
+        return none
     }
 
     parse_desc(option::get(desc))
diff --git a/src/rustdoc/markdown_index_pass.rs b/src/rustdoc/markdown_index_pass.rs
index 2aa9afe03ad..7280786db7e 100644
--- a/src/rustdoc/markdown_index_pass.rs
+++ b/src/rustdoc/markdown_index_pass.rs
@@ -106,7 +106,7 @@ fn pandoc_header_id(header: ~str) -> ~str {
     let header = convert_to_lowercase(header);
     let header = remove_up_to_first_letter(header);
     let header = maybe_use_section_id(header);
-    ret header;
+    return header;
 
     fn remove_formatting(s: ~str) -> ~str {
         str::replace(s, ~"`", ~"")
@@ -124,7 +124,7 @@ fn pandoc_header_id(header: ~str) -> ~str {
         let s = str::replace(s, ~":", ~"");
         let s = str::replace(s, ~"&", ~"");
         let s = str::replace(s, ~"^", ~"");
-        ret s;
+        return s;
     }
     fn replace_with_hyphens(s: ~str) -> ~str {
         str::replace(s, ~" ", ~"-")
diff --git a/src/rustdoc/markdown_pass.rs b/src/rustdoc/markdown_pass.rs
index a880c510b89..9337f531a31 100644
--- a/src/rustdoc/markdown_pass.rs
+++ b/src/rustdoc/markdown_pass.rs
@@ -47,7 +47,7 @@ fn run(
 
     write_markdown(sorted_doc, writer_factory);
 
-    ret doc;
+    return doc;
 }
 
 #[test]
@@ -138,7 +138,7 @@ fn make_title(page: doc::page) -> ~str {
     };
     let title = markdown_pass::header_text(item);
     let title = str::replace(title, ~"`", ~"");
-    ret title;
+    return title;
 }
 
 #[test]
@@ -378,7 +378,7 @@ fn should_write_crate_description() {
 
 fn write_index(ctxt: ctxt, index: doc::index) {
     if vec::is_empty(index.entries) {
-        ret;
+        return;
     }
 
     for index.entries.each |entry| {
@@ -589,7 +589,7 @@ fn write_variants(
     docs: ~[doc::variantdoc]
 ) {
     if vec::is_empty(docs) {
-        ret;
+        return;
     }
 
     write_header_(ctxt, h4, ~"Variants");
@@ -805,7 +805,7 @@ mod test {
     ) -> ~str {
         let (writer_factory, po) = markdown_writer::future_writer_factory();
         write_markdown(doc, writer_factory);
-        ret comm::recv(po).second();
+        return comm::recv(po).second();
     }
 
     fn write_markdown_str_srv(
@@ -815,7 +815,7 @@ mod test {
         let (writer_factory, po) = markdown_writer::future_writer_factory();
         let pass = mk_pass(writer_factory);
         pass.f(srv, doc);
-        ret comm::recv(po).second();
+        return comm::recv(po).second();
     }
 
     #[test]
diff --git a/src/rustdoc/markdown_writer.rs b/src/rustdoc/markdown_writer.rs
index ffc8092846c..08e39ba53da 100644
--- a/src/rustdoc/markdown_writer.rs
+++ b/src/rustdoc/markdown_writer.rs
@@ -142,7 +142,7 @@ fn readclose(fd: libc::c_int) -> ~str {
         buf += str::from_bytes(bytes);
     }
     os::fclose(file);
-    ret buf;
+    return buf;
 }
 
 fn generic_writer(+process: fn~(markdown: ~str)) -> writer {
diff --git a/src/rustdoc/page_pass.rs b/src/rustdoc/page_pass.rs
index e5e3866242d..eed559367d3 100644
--- a/src/rustdoc/page_pass.rs
+++ b/src/rustdoc/page_pass.rs
@@ -26,7 +26,7 @@ fn run(
 ) -> doc::doc {
 
     if output_style == config::doc_per_crate {
-        ret doc;
+        return doc;
     }
 
     let result_port = comm::port();
@@ -123,7 +123,7 @@ fn fold_nmod(
     let doc = fold::default_seq_fold_nmod(fold, doc);
     let page = doc::itempage(doc::nmodtag(doc));
     comm::send(fold.ctxt, some(page));
-    ret doc;
+    return doc;
 }
 
 #[test]
diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs
index 13a5b03c5a6..b6d225df98e 100755
--- a/src/rustdoc/rustdoc.rs
+++ b/src/rustdoc/rustdoc.rs
@@ -104,14 +104,14 @@ fn main(args: ~[~str]) {
 
     if vec::contains(args, ~"-h") {
         config::usage();
-        ret;
+        return;
     }
 
     let config = alt config::parse_config(args) {
       result::ok(config) { config }
       result::err(err) {
         io::println(fmt!{"error: %s", err});
-        ret;
+        return;
       }
     };
 
@@ -123,7 +123,7 @@ fn time<T>(what: ~str, f: fn() -> T) -> T {
     let rv = f();
     let end = std::time::precise_time_s();
     info!{"time: %3.3f s    %s", end - start, what};
-    ret rv;
+    return rv;
 }
 
 /// Runs rustdoc over the given file
diff --git a/src/rustdoc/sectionalize_pass.rs b/src/rustdoc/sectionalize_pass.rs
index 1ca660a3488..41771966881 100644
--- a/src/rustdoc/sectionalize_pass.rs
+++ b/src/rustdoc/sectionalize_pass.rs
@@ -85,7 +85,7 @@ fn sectionalize(desc: option<~str>) -> (option<~str>, ~[doc::section]) {
      */
 
     if option::is_none(desc) {
-        ret (none, ~[]);
+        return (none, ~[]);
     }
 
     let lines = str::lines(option::get(desc));