rustdoc: De-mode

Author: brson

src/librustdoc/astsrv.rs

@@ -47,7 +47,7 @@ pub type Ctxt = {
 
 type SrvOwner<T> = fn(srv: Srv) -> T;
 pub type CtxtHandler<T> = fn~(ctxt: Ctxt) -> T;
-type Parser = fn~(Session, +s: ~str) -> @ast::crate;
+type Parser = fn~(Session, s: ~str) -> @ast::crate;
 
 enum Msg {
     HandleRequest(fn~(Ctxt)),
@@ -62,15 +62,15 @@ impl Srv: Clone {
     fn clone(&self) -> Srv { copy *self }
 }
 
-pub fn from_str<T>(+source: ~str, owner: SrvOwner<T>) -> T {
+pub fn from_str<T>(source: ~str, owner: SrvOwner<T>) -> T {
     run(owner, copy source, parse::from_str_sess)
 }
 
-pub fn from_file<T>(+file: ~str, owner: SrvOwner<T>) -> T {
+pub fn from_file<T>(file: ~str, owner: SrvOwner<T>) -> T {
     run(owner, copy file, |sess, f| parse::from_file_sess(sess, &Path(f)))
 }
 
-fn run<T>(owner: SrvOwner<T>, +source: ~str, +parse: Parser) -> T {
+fn run<T>(owner: SrvOwner<T>, source: ~str, parse: Parser) -> T {
 
     let srv_ = Srv({
         ch: do util::spawn_listener |copy source, move parse, po| {
@@ -83,7 +83,7 @@ fn run<T>(owner: SrvOwner<T>, +source: ~str, +parse: Parser) -> T {
     move res
 }
 
-fn act(po: oldcomm::Port<Msg>, +source: ~str, +parse: Parser) {
+fn act(po: oldcomm::Port<Msg>, source: ~str, parse: Parser) {
     let sess = build_session();
 
     let ctxt = build_ctxt(
@@ -106,7 +106,7 @@ fn act(po: oldcomm::Port<Msg>, +source: ~str, +parse: Parser) {
 
 pub fn exec<T:Owned>(
     srv: Srv,
-    +f: fn~(ctxt: Ctxt) -> T
+    f: fn~(ctxt: Ctxt) -> T
 ) -> T {
     let (po, ch) = stream();
     let msg = HandleRequest(fn~(move f, ctxt: Ctxt) {

src/librustdoc/attr_parser.rs

@@ -36,7 +36,7 @@ mod test {
 
     use core::option::None;
 
-    pub fn parse_attributes(+source: ~str) -> ~[ast::attribute] {
+    pub fn parse_attributes(source: ~str) -> ~[ast::attribute] {
         use syntax::parse;
         use syntax::parse::parser;
         use syntax::parse::attr::parser_attr;
@@ -52,7 +52,7 @@ mod test {
 }
 
 fn doc_metas(
-    +attrs: ~[ast::attribute]
+    attrs: ~[ast::attribute]
 ) -> ~[@ast::meta_item] {
 
     let doc_attrs = attr::find_attrs_by_name(attrs, ~"doc");
@@ -63,7 +63,7 @@ fn doc_metas(
     return doc_metas;
 }
 
-pub fn parse_crate(+attrs: ~[ast::attribute]) -> CrateAttrs {
+pub fn parse_crate(attrs: ~[ast::attribute]) -> CrateAttrs {
     let link_metas = attr::find_linkage_metas(attrs);
 
     {
@@ -95,7 +95,7 @@ fn should_not_extract_crate_name_if_no_name_value_in_link_attribute() {
     assert attrs.name == None;
 }
 
-pub fn parse_desc(+attrs: ~[ast::attribute]) -> Option<~str> {
+pub fn parse_desc(attrs: ~[ast::attribute]) -> Option<~str> {
     let doc_strs = do doc_metas(attrs).filter_map |meta| {
         attr::get_meta_item_value_str(*meta)
     };
@@ -122,7 +122,7 @@ fn parse_desc_should_parse_simple_doc_attributes() {
     assert attrs == Some(~"basic");
 }
 
-pub fn parse_hidden(+attrs: ~[ast::attribute]) -> bool {
+pub fn parse_hidden(attrs: ~[ast::attribute]) -> bool {
     do doc_metas(attrs).find |meta| {
         match attr::get_meta_item_list(*meta) {
           Some(metas) => {

src/librustdoc/attr_pass.rs

@@ -43,7 +43,7 @@ pub fn mk_pass() -> Pass {
 
 pub fn run(
     srv: astsrv::Srv,
-    +doc: doc::Doc
+    doc: doc::Doc
 ) -> doc::Doc {
     let fold = Fold {
         fold_crate: fold_crate,
@@ -58,7 +58,7 @@ pub fn run(
 
 fn fold_crate(
     fold: &fold::Fold<astsrv::Srv>,
-    +doc: doc::CrateDoc
+    doc: doc::CrateDoc
 ) -> doc::CrateDoc {
 
     let srv = fold.ctxt;
@@ -89,7 +89,7 @@ fn should_replace_top_module_name_with_crate_name() {
 
 fn fold_item(
     fold: &fold::Fold<astsrv::Srv>,
-    +doc: doc::ItemDoc
+    doc: doc::ItemDoc
 ) -> doc::ItemDoc {
 
     let srv = fold.ctxt;
@@ -113,7 +113,7 @@ fn fold_item(
 fn parse_item_attrs<T:Owned>(
     srv: astsrv::Srv,
     id: doc::AstId,
-    +parse_attrs: fn~(+a: ~[ast::attribute]) -> T) -> T {
+    parse_attrs: fn~(a: ~[ast::attribute]) -> T) -> T {
     do astsrv::exec(srv) |move parse_attrs, ctxt| {
         let attrs = match ctxt.ast_map.get(id) {
           ast_map::node_item(item, _) => copy item.attrs,
@@ -156,7 +156,7 @@ fn should_extract_fn_attributes() {
 
 fn fold_enum(
     fold: &fold::Fold<astsrv::Srv>,
-    +doc: doc::EnumDoc
+    doc: doc::EnumDoc
 ) -> doc::EnumDoc {
 
     let srv = fold.ctxt;
@@ -207,7 +207,7 @@ fn should_extract_variant_docs() {
 
 fn fold_trait(
     fold: &fold::Fold<astsrv::Srv>,
-    +doc: doc::TraitDoc
+    doc: doc::TraitDoc
 ) -> doc::TraitDoc {
     let srv = fold.ctxt;
     let doc = fold::default_seq_fold_trait(fold, doc);
@@ -221,7 +221,7 @@ fn fold_trait(
 fn merge_method_attrs(
     srv: astsrv::Srv,
     item_id: doc::AstId,
-    +docs: ~[doc::MethodDoc]
+    docs: ~[doc::MethodDoc]
 ) -> ~[doc::MethodDoc] {
 
     // Create an assoc list from method name to attributes
@@ -284,7 +284,7 @@ fn should_extract_trait_method_docs() {
 
 fn fold_impl(
     fold: &fold::Fold<astsrv::Srv>,
-    +doc: doc::ImplDoc
+    doc: doc::ImplDoc
 ) -> doc::ImplDoc {
     let srv = fold.ctxt;
     let doc = fold::default_seq_fold_impl(fold, doc);
@@ -319,7 +319,7 @@ mod test {
     use doc;
     use extract;
 
-    pub fn mk_doc(+source: ~str) -> doc::Doc {
+    pub fn mk_doc(source: ~str) -> doc::Doc {
         do astsrv::from_str(copy source) |srv| {
             let doc = extract::from_srv(srv, ~"");
             run(srv, doc)

src/librustdoc/config.rs

@@ -123,7 +123,7 @@ pub fn parse_config(args: &[~str]) -> Result<Config, ~str> {
 
 pub fn parse_config_(
     args: &[~str],
-    +program_output: ProgramOutput
+    program_output: ProgramOutput
 ) -> Result<Config, ~str> {
     let args = args.tail();
     let opts = vec::unzip(opts()).first();
@@ -147,7 +147,7 @@ pub fn parse_config_(
 fn config_from_opts(
     input_crate: &Path,
     matches: &getopts::Matches,
-    +program_output: ProgramOutput
+    program_output: ProgramOutput
 ) -> Result<Config, ~str> {
 
     let config = default_config(input_crate);
@@ -222,8 +222,8 @@ fn parse_output_style(output_style: &str) -> Result<OutputStyle, ~str> {
 
 fn maybe_find_pandoc(
     config: &Config,
-    +maybe_pandoc_cmd: Option<~str>,
-    +program_output: ProgramOutput
+    maybe_pandoc_cmd: Option<~str>,
+    program_output: ProgramOutput
 ) -> Result<Option<~str>, ~str> {
     if config.output_format != PandocHtml {
         return result::Ok(maybe_pandoc_cmd);

src/librustdoc/demo.rs

@@ -39,8 +39,8 @@ enum OmNomNomy {
 }
 
 fn take_my_order_please(
-    +_waitperson: WaitPerson,
-    +_order: ~[OmNomNomy]
+    _waitperson: WaitPerson,
+    _order: ~[OmNomNomy]
 ) -> uint {
 
     /*!

src/librustdoc/desc_to_brief_pass.rs

@@ -37,7 +37,7 @@ pub fn mk_pass() -> Pass {
 
 pub fn run(
     _srv: astsrv::Srv,
-    +doc: doc::Doc
+    doc: doc::Doc
 ) -> doc::Doc {
     let fold = Fold {
         fold_item: fold_item,
@@ -48,7 +48,7 @@ pub fn run(
     (fold.fold_doc)(&fold, doc)
 }
 
-fn fold_item(fold: &fold::Fold<()>, +doc: doc::ItemDoc) -> doc::ItemDoc {
+fn fold_item(fold: &fold::Fold<()>, doc: doc::ItemDoc) -> doc::ItemDoc {
     let doc = fold::default_seq_fold_item(fold, doc);
 
     doc::ItemDoc {
@@ -57,7 +57,7 @@ fn fold_item(fold: &fold::Fold<()>, +doc: doc::ItemDoc) -> doc::ItemDoc {
     }
 }
 
-fn fold_trait(fold: &fold::Fold<()>, +doc: doc::TraitDoc) -> doc::TraitDoc {
+fn fold_trait(fold: &fold::Fold<()>, doc: doc::TraitDoc) -> doc::TraitDoc {
     let doc =fold::default_seq_fold_trait(fold, doc);
 
     doc::TraitDoc {
@@ -69,7 +69,7 @@ fn fold_trait(fold: &fold::Fold<()>, +doc: doc::TraitDoc) -> doc::TraitDoc {
     }
 }
 
-fn fold_impl(fold: &fold::Fold<()>, +doc: doc::ImplDoc) -> doc::ImplDoc {
+fn fold_impl(fold: &fold::Fold<()>, doc: doc::ImplDoc) -> doc::ImplDoc {
     let doc =fold::default_seq_fold_impl(fold, doc);
 
     doc::ImplDoc {
@@ -108,7 +108,7 @@ pub mod test {
     use doc;
     use extract;
 
-    pub fn mk_doc(+source: ~str) -> doc::Doc {
+    pub fn mk_doc(source: ~str) -> doc::Doc {
         do astsrv::from_str(copy source) |srv| {
             let doc = extract::from_srv(srv, ~"");
             let doc = (attr_pass::mk_pass().f)(srv, doc);
@@ -117,15 +117,15 @@ pub mod test {
     }
 }
 
-fn extract(+desc: Option<~str>) -> Option<~str> {
+fn extract(desc: Option<~str>) -> Option<~str> {
     if desc.is_none() {
         return None
     }
 
     parse_desc((copy desc).get())
 }
 
-fn parse_desc(+desc: ~str) -> Option<~str> {
+fn parse_desc(desc: ~str) -> Option<~str> {
 
     const max_brief_len: uint = 120u;
 
@@ -141,7 +141,7 @@ fn parse_desc(+desc: ~str) -> Option<~str> {
     }
 }
 
-fn first_sentence(+s: ~str) -> Option<~str> {
+fn first_sentence(s: ~str) -> Option<~str> {
     let paras = paragraphs(copy s);
     if !paras.is_empty() {
         let first_para = vec::head(paras);
@@ -151,7 +151,7 @@ fn first_sentence(+s: ~str) -> Option<~str> {
     }
 }
 
-fn first_sentence_(+s: ~str) -> ~str {
+fn first_sentence_(s: ~str) -> ~str {
     let mut dotcount = 0;
     // The index of the character following a single dot. This allows
     // Things like [0..1) to appear in the brief description
@@ -182,7 +182,7 @@ fn first_sentence_(+s: ~str) -> ~str {
     }
 }
 
-fn paragraphs(+s: ~str) -> ~[~str] {
+fn paragraphs(s: ~str) -> ~[~str] {
     let lines = str::lines_any(s);
     let mut whitespace_lines = 0;
     let mut accum = ~"";