---

erickt · erickt · commit 75655efa9e55 · 2013-03-05T19:37:04.000-08:00
yaml --- r: 138732 b: refs/heads/try2 c: 431e756 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: ac4016ff992bde67b37448200abdc84680d49d72
+refs/heads/try2: 431e756fd72df1c092e71f6e605e82385a9c6881
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/librustdoc/desc_to_brief_pass.rs b/branches/try2/src/librustdoc/desc_to_brief_pass.rs
@@ -142,7 +142,7 @@ fn parse_desc(desc: ~str) -> Option<~str> {
 }
 
 fn first_sentence(s: ~str) -> Option<~str> {
-    let paras = paragraphs(copy s);
+    let paras = paragraphs(s);
     if !paras.is_empty() {
         let first_para = vec::head(paras);
         Some(str::replace(first_sentence_(first_para), ~"\n", ~" "))
@@ -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 = ~"";

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ fn parse_desc(desc: ~str) -> Option<~str> {`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`fn first_sentence(s: ~str) -> Option<~str> {`
`145`		`- let paras = paragraphs(copy s);`
	`145`	`+ let paras = paragraphs(s);`
`146`	`146`	`if !paras.is_empty() {`
`147`	`147`	`let first_para = vec::head(paras);`
`148`	`148`	`Some(str::replace(first_sentence_(first_para), ~"\n", ~" "))`
`@@ -182,7 +182,7 @@ fn first_sentence_(s: ~str) -> ~str {`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`
`185`		`-fn paragraphs(s: ~str) -> ~[~str] {`
	`185`	`+fn paragraphs(s: &str) -> ~[~str] {`
`186`	`186`	`let lines = str::lines_any(s);`
`187`	`187`	`let mut whitespace_lines = 0;`
`188`	`188`	`let mut accum = ~"";`