bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #40338 - GuillaumeGomez:pulldown-switch, r=frewsxcv,steveklabnik

Browse source 
Replace hoedown with pull in rustdoc

cc @rust-lang/docs
This commit is contained in:
bors 2017-03-29 07:06:13 +00:00
commit abf5592510
12 changed files with 560 additions and 527 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustdoc/markdown.rs
View file

@ -25,7 +25,7 @@ use externalfiles::{ExternalHtml, LoadStringError, load_string};
use html::render::reset_ids;
use html::escape::Escape;
use html::markdown;
use html::markdown::{Markdown, MarkdownWithToc, find_testable_code};
use html::markdown::{Markdown, MarkdownWithToc, MarkdownOutputStyle, find_testable_code};
use test::{TestOptions, Collector};
/// Separate any lines at the start of the file that begin with `# ` or `%`.
@ -96,7 +96,7 @@ pub fn render(input: &str, mut output: PathBuf, matches: &getopts::Matches,
let rendered = if include_toc {
format!("{}", MarkdownWithToc(text))
} else {
format!("{}", Markdown(text))
format!("{}", Markdown(text, MarkdownOutputStyle::Fancy))
};
let err = write!(