bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Print warning whatever the rendering mode

Browse source
This commit is contained in:
Guillaume Gomez 2017-07-31 23:04:32 +02:00
parent 33d99e526e
commit f2774b7ac3
7 changed files with 139 additions and 1114 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,7 +75,6 @@ use html::item_type::ItemType;
use html::markdown::{self, Markdown, MarkdownHtml, MarkdownSummaryLine, RenderType};
use html::{highlight, layout};
#[cfg(not(any(stage0, stage1)))]
use html_diff;
/// A pair of name and its optional document.
@ -1648,33 +1647,23 @@ fn document(w: &mut fmt::Formatter, cx: &Context, item: &clean::Item) -> fmt::Re
Ok(())
}
#[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 {
let output = format!("{}", Markdown(md_text, render_type));
let old = format!("{}", Markdown(md_text, RenderType::Hoedown));
let differences = html_diff::get_differences(&output, &old);
if !differences.is_empty() {
println!("Differences spotted in {:?}:\n{}",
md_text,
differences.iter()
.map(|s| format!("=> {}", s.to_string()))
.collect::<Vec<String>>()
.join("\n"));
}
write!(w, "<div class='docblock'>{}{}</div>", prefix, output)
} else {
write!(w, "<div class='docblock'>{}{}</div>",
prefix,
Markdown(md_text, render_type))
let output = format!("{}", Markdown(md_text, render_type));
let old = format!("{}", Markdown(md_text, match render_type {
RenderType::Hoedown => RenderType::Pulldown,
RenderType::Pulldown => RenderType::Hoedown,
}));
let differences = html_diff::get_differences(&output, &old);
if !differences.is_empty() {
println!("Differences spotted in {:?}:\n{}",
md_text,
differences.iter()
.map(|s| format!("=> {}", s.to_string()))
.collect::<Vec<String>>()
.join("\n"));
}
}
#[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))
write!(w, "<div class='docblock'>{}{}</div>", prefix, output)
}
fn document_short(w: &mut fmt::Formatter, item: &clean::Item, link: AssocItemLink,