Skip to content

Commit d4424d8

Browse files
Escape more items in the sidebar when needed
1 parent b058dc0 commit d4424d8

File tree

2 files changed

+49
-3
lines changed

2 files changed

+49
-3
lines changed

src/librustdoc/html/render.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -3709,9 +3709,10 @@ fn sidebar_assoc_items(it: &clean::Item) -> String {
37093709
})).and_then(|did| c.impls.get(&did));
37103710
if let Some(impls) = inner_impl {
37113711
out.push_str("<a class=\"sidebar-title\" href=\"#deref-methods\">");
3712-
out.push_str(&format!("Methods from {:#}&lt;Target={:#}&gt;",
3713-
impl_.inner_impl().trait_.as_ref().unwrap(),
3714-
target));
3712+
out.push_str(&format!("Methods from {}&lt;Target={}&gt;",
3713+
Escape(&format!("{:#}",
3714+
impl_.inner_impl().trait_.as_ref().unwrap())),
3715+
Escape(&format!("{:#}", target))));
37153716
out.push_str("</a>");
37163717
let ret = impls.iter()
37173718
.filter(|i| i.inner_impl().trait_.is_none())
+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![crate_name = "foo"]
12+
13+
use std::ops::{Deref, DerefMut};
14+
15+
#[derive(Debug, Clone)]
16+
pub struct Title {
17+
name: String,
18+
}
19+
20+
#[derive(Debug, Clone)]
21+
pub struct TitleList {
22+
pub members: Vec<Title>,
23+
}
24+
25+
impl TitleList {
26+
pub fn new() -> Self {
27+
TitleList { members: Vec::new() }
28+
}
29+
}
30+
31+
impl Deref for TitleList {
32+
type Target = Vec<Title>;
33+
34+
fn deref(&self) -> &Self::Target {
35+
&self.members
36+
}
37+
}
38+
39+
// @has foo/struct.TitleList.html
40+
// @has - '//*[@class="sidebar-title"]' 'Methods from Deref<Target=Vec<Title>>'
41+
impl DerefMut for TitleList {
42+
fn deref_mut(&mut self) -> &mut Self::Target {
43+
&mut self.members
44+
}
45+
}

0 commit comments

Comments
 (0)