rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Display rustdoc pulldown switch warnings everytime

Browse Source
This commit is contained in:
Guillaume Gomez
2017-10-16 21:41:10 +02:00
parent ba4e8d7db3
commit 11b2b08ba9
1 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1826,8 +1826,6 @@ fn render_markdown(w: &mut fmt::Formatter,
prefix: &str, prefix: &str,
scx: &SharedContext) scx: &SharedContext)
-> fmt::Result { -> fmt::Result {
// We only emit warnings if the user has opted-in to Pulldown rendering.
let output = if render_type == RenderType::Pulldown {
// Save the state of USED_ID_MAP so it only gets updated once even // Save the state of USED_ID_MAP so it only gets updated once even
// though we're rendering twice. // though we're rendering twice.
let orig_used_id_map = USED_ID_MAP.with(|map| map.borrow().clone()); let orig_used_id_map = USED_ID_MAP.with(|map| map.borrow().clone());
@@ -1851,12 +1849,9 @@ fn render_markdown(w: &mut fmt::Formatter,
scx.markdown_warnings.borrow_mut().push((span, md_text.to_owned(), differences)); scx.markdown_warnings.borrow_mut().push((span, md_text.to_owned(), differences));
} }
pulldown_output write!(w, "<div class='docblock'>{}{}</div>",
} else { prefix,
format!("{}", Markdown(md_text, RenderType::Hoedown)) if render_type == RenderType::Pulldown { pulldown_output } else { hoedown_output })
};
write!(w, "<div class='docblock'>{}{}</div>", prefix, output)
} }
fn document_short(w: &mut fmt::Formatter, item: &clean::Item, link: AssocItemLink, fn document_short(w: &mut fmt::Formatter, item: &clean::Item, link: AssocItemLink,