---

mitaa · mitaa · commit b161a85ae51d · 2016-02-27T06:42:30.000+01:00
yaml --- r: 275285 b: refs/heads/stable c: 0b3bc9b h: refs/heads/master i: 275283: e34e5dd
diff --git a/[refs] b/[refs]
@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 2352c1c5396681230d5ea5c99944e65ab673c3c8
+refs/heads/stable: 0b3bc9b5e29ba867172120361fb32716fdb99e30
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e
diff --git a/branches/stable/src/librustdoc/html/render.rs b/branches/stable/src/librustdoc/html/render.rs
@@ -1657,8 +1657,8 @@ fn shorter<'a>(s: Option<&'a str>) -> String {
 
 #[inline]
 fn plain_summary_line(s: Option<&str>) -> String {
-    let md = markdown::plain_summary_line(s.unwrap_or(""));
-    shorter(Some(&md)).replace("\n", " ")
+    let line = shorter(s).replace("\n", " ");
+    markdown::plain_summary_line(&line[..])
 }
 
 fn document(w: &mut fmt::Formatter, cx: &Context, item: &clean::Item) -> fmt::Result {

Original file line number	Diff line number	Diff line change
`@@ -1657,8 +1657,8 @@ fn shorter<'a>(s: Option<&'a str>) -> String {`
`1657`	`1657`
`1658`	`1658`	`#[inline]`
`1659`	`1659`	`fn plain_summary_line(s: Option<&str>) -> String {`
`1660`		`- let md = markdown::plain_summary_line(s.unwrap_or(""));`
`1661`		`- shorter(Some(&md)).replace("\n", " ")`
	`1660`	`+ let line = shorter(s).replace("\n", " ");`
	`1661`	`+ markdown::plain_summary_line(&line[..])`
`1662`	`1662`	`}`
`1663`	`1663`
`1664`	`1664`	`fn document(w: &mut fmt::Formatter, cx: &Context, item: &clean::Item) -> fmt::Result {`