Rollup merge of #47855 - ollie27:rustdoc_hoedown_link_title, r=QuietMisdreavus

rustdoc: Fix link title rendering with hoedown

The link title needs to be HTML escaped.

It was broken by #47046.

r? @QuietMisdreavus
This commit is contained in:
kennytm 2018-01-30 17:11:00 +08:00 committed by GitHub
commit 393a1994af
2 changed files with 20 additions and 1 deletions

View File

@ -872,7 +872,7 @@ pub fn render(w: &mut fmt::Formatter,
let link_out = format!("<a href=\"{link}\"{title}>{content}</a>", let link_out = format!("<a href=\"{link}\"{title}>{content}</a>",
link = link_buf, link = link_buf,
title = title.map_or(String::new(), title = title.map_or(String::new(),
|t| format!(" title=\"{}\"", t)), |t| format!(" title=\"{}\"", Escape(&t))),
content = content.unwrap_or(String::new())); content = content.unwrap_or(String::new()));
unsafe { hoedown_buffer_put(ob, link_out.as_ptr(), link_out.len()); } unsafe { hoedown_buffer_put(ob, link_out.as_ptr(), link_out.len()); }

View File

@ -0,0 +1,19 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// compile-flags: -Z unstable-options --disable-commonmark
#![crate_name = "foo"]
//! hello [foo]
//!
//! [foo]: url 'title & <stuff> & "things"'
// @has 'foo/index.html' 'title &amp; &lt;stuff&gt; &amp; &quot;things&quot;'