about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-03-06 13:56:41 -0800
committerbors <bors@rust-lang.org>2014-03-06 13:56:41 -0800
commitbd47f679faffaeedd0c046d814d11dc9d2755ee1 (patch)
treec5ff19081d9ef453cfa53db746376d2055effb1b
parent987de2986539fe01e86aa711b43f05e94becba89 (diff)
parent9f6bcedb6767dafbb65d6536429eccea2c600103 (diff)
downloadrust-bd47f679faffaeedd0c046d814d11dc9d2755ee1.tar.gz
rust-bd47f679faffaeedd0c046d814d11dc9d2755ee1.zip
auto merge of #12737 : alexcrichton/rust/issue-12736, r=brson
Turns out sundown has already escaped this content for us, so there's no need
for us to escape it again.

Closes #12736
-rw-r--r--src/librustdoc/html/markdown.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs
index 1c692677590..aca20331f0a 100644
--- a/src/librustdoc/html/markdown.rs
+++ b/src/librustdoc/html/markdown.rs
@@ -38,7 +38,6 @@ use std::vec;
 use collections::HashMap;
 
 use html::highlight;
-use html::escape::Escape;
 
 /// A unit struct which has the `fmt::Show` trait implemented. When
 /// formatted, this struct will emit the HTML corresponding to the rendered
@@ -198,7 +197,7 @@ pub fn render(w: &mut io::Writer, s: &str) -> fmt::Result {
 
         // Render the HTML
         let text = format!(r#"<h{lvl} id="{id}">{}</h{lvl}>"#,
-                           Escape(s.as_slice()), lvl = level, id = id);
+                           s, lvl = level, id = id);
         text.with_c_str(|p| unsafe { bufputs(ob, p) });
     }