about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2018-01-12 22:47:31 +0100
committerGuillaume Gomez <guillaume1.gomez@gmail.com>2018-01-12 22:47:31 +0100
commitf31204662b6d5ab343b901d9684ecda71e777cc0 (patch)
tree61941d10b0208fc7fdc24d34ec83d6ca3d1fc718
parent0b90e4e8cd068910f604f3e1fb5d03cc01f1658f (diff)
downloadrust-f31204662b6d5ab343b901d9684ecda71e777cc0.tar.gz
rust-f31204662b6d5ab343b901d9684ecda71e777cc0.zip
Switch to pulldown as default markdown renderer
-rw-r--r--src/librustdoc/lib.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 1740816ef6b..8a3856db9b9 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -241,8 +241,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")
@@ -346,10 +346,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 {