Skip to content

Commit

Permalink
Rollup merge of rust-lang#47398 - GuillaumeGomez:pulldown-warnings, r…
Browse files Browse the repository at this point in the history
…=QuietMisdreavus

Switch to pulldown as default markdown renderer

r? @QuietMisdreavus
  • Loading branch information
GuillaumeGomez committed Jan 14, 2018
2 parents e11f540 + f312046 commit d4d8d76
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/librustdoc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit d4d8d76

Please sign in to comment.