mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-26 08:44:35 +00:00
Shorten docstrings after Markdown rendering
This commit is contained in:
parent
77f9231818
commit
5c98ae34a6
@ -1653,8 +1653,8 @@ fn shorter<'a>(s: Option<&'a str>) -> String {
|
||||
|
||||
#[inline]
|
||||
fn plain_summary_line(s: Option<&str>) -> String {
|
||||
let line = shorter(s).replace("\n", " ");
|
||||
markdown::plain_summary_line(&line[..])
|
||||
let md = markdown::plain_summary_line(s.unwrap_or(""));
|
||||
shorter(Some(&md)).replace("\n", " ")
|
||||
}
|
||||
|
||||
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 {
|
||||
String::new()
|
||||
};
|
||||
let doc_value = myitem.doc_value().unwrap_or("");
|
||||
try!(write!(w, "
|
||||
<tr class='{stab} module-item'>
|
||||
<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(),
|
||||
stab_docs = stab_docs,
|
||||
docs = Markdown(&shorter(myitem.doc_value())),
|
||||
docs = shorter(Some(&Markdown(doc_value).to_string())),
|
||||
class = shortty(myitem),
|
||||
stab = myitem.stability_class(),
|
||||
href = item_path(myitem),
|
||||
|
16
src/test/rustdoc/issue-30366.rs
Normal file
16
src/test/rustdoc/issue-30366.rs
Normal 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() { }
|
Loading…
Reference in New Issue
Block a user