squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #47398 - GuillaumeGomez:pulldown-warnings, r=QuietMisdreavus

Browse source 
Switch to pulldown as default markdown renderer

r? @QuietMisdreavus
This commit is contained in:
Guillaume Gomez 2018-01-17 23:43:28 +01:00 committed by GitHub
commit 49065a1419
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/librustdoc/lib.rs
View file

@ -242,8 +242,8 @@ pub fn opts() -> Vec<RustcOptGroup> {
or `#![doc(html_playground_url=...)]`",
"URL")
}),
unstable("enable-commonmark", |o| {
o.optflag("", "enable-commonmark", "to enable commonmark doc rendering/testing")
unstable("disable-commonmark", |o| {
o.optflag("", "disable-commonmark", "to disable commonmark doc rendering/testing")
}),
unstable("display-warnings", |o| {
o.optflag("", "display-warnings", "to print code warnings when testing doc")
@ -347,10 +347,10 @@ pub fn main_args(args: &[String]) -> isize {
let css_file_extension = matches.opt_str("e").map(|s| PathBuf::from(&s));
let cfgs = matches.opt_strs("cfg");
let render_type = if matches.opt_present("enable-commonmark") {
RenderType::Pulldown
} else {
let render_type = if matches.opt_present("disable-commonmark") {
RenderType::Hoedown
} else {
RenderType::Pulldown
};
if let Some(ref p) = css_file_extension {