about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorOliver Middleton <olliemail27@gmail.com>2017-04-06 13:09:20 +0100
committerOliver Middleton <olliemail27@gmail.com>2017-04-06 13:09:20 +0100
commitf9fb381b2a13260c3fcdae2f6d9546ab2c87e717 (patch)
tree3c5a52c16c1f5a25f5d2288b858e45fd7bfb0688 /src/tools
parente5e92753cc3e12c3c468b6badaf340fe4443145c (diff)
downloadrust-f9fb381b2a13260c3fcdae2f6d9546ab2c87e717.tar.gz
rust-f9fb381b2a13260c3fcdae2f6d9546ab2c87e717.zip
rustdoc: Use pulldown-cmark for Markdown HTML rendering
Instead of rendering all of the HTML in rustdoc this relies on
pulldown-cmark's `push_html` to do most of the work. A few iterator
adapters are used to make rustdoc specific modifications to the output.

This also fixes MarkdownHtml and link titles in plain_summary_line.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/error_index_generator/main.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/error_index_generator/main.rs b/src/tools/error_index_generator/main.rs
index 5db2ad83a0a..efadde99227 100644
--- a/src/tools/error_index_generator/main.rs
+++ b/src/tools/error_index_generator/main.rs
@@ -24,7 +24,7 @@ use std::path::PathBuf;
 
 use syntax::diagnostics::metadata::{get_metadata_dir, ErrorMetadataMap, ErrorMetadata};
 
-use rustdoc::html::markdown::{Markdown, MarkdownOutputStyle, PLAYGROUND};
+use rustdoc::html::markdown::{Markdown, PLAYGROUND};
 use rustc_serialize::json;
 
 enum OutputFormat {
@@ -100,7 +100,7 @@ impl Formatter for HTMLFormatter {
 
         // Description rendered as markdown.
         match info.description {
-            Some(ref desc) => write!(output, "{}", Markdown(desc, MarkdownOutputStyle::Fancy))?,
+            Some(ref desc) => write!(output, "{}", Markdown(desc))?,
             None => write!(output, "<p>No description.</p>\n")?,
         }