Rollup merge of #46847 - GuillaumeGomez:more-sidebar-escape, r=QuietMisdreavus
Escape more items in the sidebar when needed Fixes #46724. r? @QuietMisdreavus
This commit is contained in:
commit
256bf2be62
@ -3718,9 +3718,10 @@ fn sidebar_assoc_items(it: &clean::Item) -> String {
|
|||||||
})).and_then(|did| c.impls.get(&did));
|
})).and_then(|did| c.impls.get(&did));
|
||||||
if let Some(impls) = inner_impl {
|
if let Some(impls) = inner_impl {
|
||||||
out.push_str("<a class=\"sidebar-title\" href=\"#deref-methods\">");
|
out.push_str("<a class=\"sidebar-title\" href=\"#deref-methods\">");
|
||||||
out.push_str(&format!("Methods from {:#}<Target={:#}>",
|
out.push_str(&format!("Methods from {}<Target={}>",
|
||||||
impl_.inner_impl().trait_.as_ref().unwrap(),
|
Escape(&format!("{:#}",
|
||||||
target));
|
impl_.inner_impl().trait_.as_ref().unwrap())),
|
||||||
|
Escape(&format!("{:#}", target))));
|
||||||
out.push_str("</a>");
|
out.push_str("</a>");
|
||||||
let ret = impls.iter()
|
let ret = impls.iter()
|
||||||
.filter(|i| i.inner_impl().trait_.is_none())
|
.filter(|i| i.inner_impl().trait_.is_none())
|
||||||
|
45
src/test/rustdoc/escape-deref-methods.rs
Normal file
45
src/test/rustdoc/escape-deref-methods.rs
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
// Copyright 2017 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.
|
||||||
|
|
||||||
|
#![crate_name = "foo"]
|
||||||
|
|
||||||
|
use std::ops::{Deref, DerefMut};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct Title {
|
||||||
|
name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct TitleList {
|
||||||
|
pub members: Vec<Title>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TitleList {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
TitleList { members: Vec::new() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Deref for TitleList {
|
||||||
|
type Target = Vec<Title>;
|
||||||
|
|
||||||
|
fn deref(&self) -> &Self::Target {
|
||||||
|
&self.members
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// @has foo/struct.TitleList.html
|
||||||
|
// @has - '//*[@class="sidebar-title"]' 'Methods from Deref<Target=Vec<Title>>'
|
||||||
|
impl DerefMut for TitleList {
|
||||||
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||||
|
&mut self.members
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user