bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Update unstable-crate test

Browse source
This commit is contained in:
Guillaume Gomez 2017-06-14 13:35:45 +02:00
parent 274543b9ca
commit e1367ef1b1
7 changed files with 1118 additions and 537 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/librustdoc/html/render.rs
View file

@ -75,7 +75,7 @@ use html::item_type::ItemType;
use html::markdown::{self, Markdown, MarkdownHtml, MarkdownSummaryLine, RenderType};
use html::{highlight, layout};
#[cfg(not(stage0))]
#[cfg(not(any(stage0, stage1)))]
use html_diff;
/// A pair of name and its optional document.
@ -1648,7 +1648,7 @@ fn document(w: &mut fmt::Formatter, cx: &Context, item: &clean::Item) -> fmt::Re
Ok(())
}
#[cfg(not(stage0))]
#[cfg(not(any(stage0, stage1)))]
fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType,
prefix: &str) -> fmt::Result {
if render_type == RenderType::Pulldown {
@ -1671,9 +1671,10 @@ fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType,
}
}
#[cfg(stage0)]
fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType) -> fmt::Result {
write!(w, "<div class='docblock'>{}</div>", Markdown(md_text, render_type))
#[cfg(any(stage0, stage1))]
fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType,
prefix: &str) -> fmt::Result {
write!(w, "<div class='docblock'>{}{}</div>", prefix, Markdown(md_text, render_type))
}
fn document_short(w: &mut fmt::Formatter, item: &clean::Item, link: AssocItemLink,
@ -1685,7 +1686,7 @@ fn document_short(w: &mut fmt::Formatter, item: &clean::Item, link: AssocItemLin
} else {
format!("{}", &plain_summary_line(Some(s)))
};
get_html_diff(&markdown, render_type, prefix)?;
get_html_diff(w, &markdown, render_type, prefix)?;
} else if !prefix.is_empty() {
write!(w, "<div class='docblock'>{}</div>", prefix)?;
}
@ -1709,7 +1710,7 @@ fn render_assoc_const_value(item: &clean::Item) -> String {
fn document_full(w: &mut fmt::Formatter, item: &clean::Item,
render_type: RenderType, prefix: &str) -> fmt::Result {
if let Some(s) = item.doc_value() {
get_html_diff(format!("{}{}", md_render_assoc_item(item), s), render_type, prefix)?;
get_html_diff(w, s, render_type, prefix)?;
} else if !prefix.is_empty() {
write!(w, "<div class='docblock'>{}</div>", prefix)?;
}