---

yaml
---
r: 36401
b: refs/heads/try2
c: 809bd3e
h: refs/heads/master
i:
  36399: f6a52ad
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 451463ab39083e6aba5fc215a6f349236dff9872
+refs/heads/try2: 809bd3e5efa00a7a3f924bc3999568d67574e4e7
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/librustdoc/fold.rs

@@ -34,7 +34,7 @@ type Fold_<T> = {
 // This exists because fn types don't infer correctly as record
 // initializers, but they do as function arguments
 fn mk_fold<T:Copy>(
-    ctxt: T,
+    +ctxt: T,
     +fold_doc: FoldDoc<T>,
     +fold_crate: FoldCrate<T>,
     +fold_item: FoldItem<T>,
@@ -65,7 +65,7 @@ fn mk_fold<T:Copy>(
     })
 }
 
-pub fn default_any_fold<T:Send Copy>(ctxt: T) -> Fold<T> {
+pub fn default_any_fold<T:Send Copy>(+ctxt: T) -> Fold<T> {
     mk_fold(
         ctxt,
         |f, d| default_seq_fold_doc(f, d),
@@ -83,7 +83,7 @@ pub fn default_any_fold<T:Send Copy>(ctxt: T) -> Fold<T> {
     )
 }
 
-pub fn default_seq_fold<T:Copy>(ctxt: T) -> Fold<T> {
+pub fn default_seq_fold<T:Copy>(+ctxt: T) -> Fold<T> {
     mk_fold(
         ctxt,
         |f, d| default_seq_fold_doc(f, d),
@@ -101,7 +101,7 @@ pub fn default_seq_fold<T:Copy>(ctxt: T) -> Fold<T> {
     )
 }
 
-pub fn default_par_fold<T:Send Copy>(ctxt: T) -> Fold<T> {
+pub fn default_par_fold<T:Send Copy>(+ctxt: T) -> Fold<T> {
     mk_fold(
         ctxt,
         |f, d| default_seq_fold_doc(f, d),

branches/try2/src/librustdoc/markdown_index_pass.rs

@@ -51,8 +51,8 @@ fn fold_nmod(
 }
 
 fn build_mod_index(
-    doc: doc::ModDoc,
-    config: config::Config
+    +doc: doc::ModDoc,
+    +config: config::Config
 ) -> doc::Index {
     {
         entries: par::map(doc.items, |doc| {
@@ -62,8 +62,8 @@ fn build_mod_index(
 }
 
 fn build_nmod_index(
-    doc: doc::NmodDoc,
-    config: config::Config
+    +doc: doc::NmodDoc,
+    +config: config::Config
 ) -> doc::Index {
     {
         entries: par::map(doc.fns, |doc| {
@@ -73,8 +73,8 @@ fn build_nmod_index(
 }
 
 fn item_to_entry(
-    doc: doc::ItemTag,
-    config: config::Config
+    +doc: doc::ItemTag,
+    +config: config::Config
 ) -> doc::IndexEntry {
     let link = match doc {
       doc::ModTag(_) | doc::NmodTag(_)
@@ -94,7 +94,7 @@ fn item_to_entry(
     }
 }
 
-fn pandoc_header_id(header: ~str) -> ~str {
+fn pandoc_header_id(header: &str) -> ~str {
 
     // http://johnmacfarlane.net/pandoc/README.html#headers
 
@@ -106,10 +106,10 @@ fn pandoc_header_id(header: ~str) -> ~str {
     let header = maybe_use_section_id(header);
     return header;
 
-    fn remove_formatting(s: ~str) -> ~str {
+    fn remove_formatting(s: &str) -> ~str {
         str::replace(s, ~"`", ~"")
     }
-    fn remove_punctuation(s: ~str) -> ~str {
+    fn remove_punctuation(s: &str) -> ~str {
         let s = str::replace(s, ~"<", ~"");
         let s = str::replace(s, ~">", ~"");
         let s = str::replace(s, ~"[", ~"");
@@ -124,17 +124,17 @@ fn pandoc_header_id(header: ~str) -> ~str {
         let s = str::replace(s, ~"^", ~"");
         return s;
     }
-    fn replace_with_hyphens(s: ~str) -> ~str {
+    fn replace_with_hyphens(s: &str) -> ~str {
         // Collapse sequences of whitespace to a single dash
         // XXX: Hacky implementation here that only covers
         // one or two spaces.
         let s = str::replace(s, ~"  ", ~"-");
         let s = str::replace(s, ~" ", ~"-");
         return s;
     }
-    fn convert_to_lowercase(s: ~str) -> ~str { str::to_lower(s) }
-    fn remove_up_to_first_letter(s: ~str) -> ~str { s }
-    fn maybe_use_section_id(s: ~str) -> ~str { s }
+    fn convert_to_lowercase(s: &str) -> ~str { str::to_lower(s) }
+    fn remove_up_to_first_letter(s: &str) -> ~str { s.to_str() }
+    fn maybe_use_section_id(s: &str) -> ~str { s.to_str() }
 }
 
 #[test]
@@ -232,7 +232,7 @@ fn should_index_foreign_mod_contents() {
 #[cfg(test)]
 mod test {
     #[legacy_exports];
-    fn mk_doc(output_style: config::OutputStyle, source: ~str) -> doc::Doc {
+    fn mk_doc(output_style: config::OutputStyle, +source: ~str) -> doc::Doc {
         do astsrv::from_str(source) |srv| {
             let config = {
                 output_style: output_style,