OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #31602 - mitaa:rdoc_doc_shorter, r=alexcrichton

Browse Source 
fixes #25787
fixes #30366

r? @alexcrichton
This commit is contained in:
bors 2016-02-13 21:43:28 +00:00
commit 6e446532e8
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/librustdoc/html/render.rs
View File

@ -1653,8 +1653,8 @@ fn shorter<'a>(s: Option<&'a str>) -> String {
#[inline] #[inline]
fn plain_summary_line(s: Option<&str>) -> String { fn plain_summary_line(s: Option<&str>) -> String {
let line = shorter(s).replace("\n", " "); let md = markdown::plain_summary_line(s.unwrap_or(""));
markdown::plain_summary_line(&line[..]) shorter(Some(&md)).replace("\n", " ")
} }
fn document(w: &mut fmt::Formatter, cx: &Context, item: &clean::Item) -> fmt::Result { fn document(w: &mut fmt::Formatter, cx: &Context, item: &clean::Item) -> fmt::Result {
@ -1781,6 +1781,7 @@ fn item_module(w: &mut fmt::Formatter, cx: &Context,
} else { } else {
String::new() String::new()
}; };
let doc_value = myitem.doc_value().unwrap_or("");
try!(write!(w, " try!(write!(w, "
<tr class='{stab} module-item'> <tr class='{stab} module-item'>
<td><a class='{class}' href='{href}' <td><a class='{class}' href='{href}'
@ -1792,7 +1793,7 @@ fn item_module(w: &mut fmt::Formatter, cx: &Context,
", ",
name = *myitem.name.as_ref().unwrap(), name = *myitem.name.as_ref().unwrap(),
stab_docs = stab_docs, stab_docs = stab_docs,
docs = Markdown(&shorter(myitem.doc_value())), docs = shorter(Some(&Markdown(doc_value).to_string())),
class = shortty(myitem), class = shortty(myitem),
stab = myitem.stability_class(), stab = myitem.stability_class(),
href = item_path(myitem), href = item_path(myitem),

16
src/test/rustdoc/issue-30366.rs Normal file
View File

@ -0,0 +1,16 @@
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// @has issue_30366/index.html '//a/@href' 'http://www.rust-lang.org/'
/// Describe it. [Link somewhere][1].
///
/// [1]: http://www.rust-lang.org/
pub fn here_is_a_fn() { }