bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #46922 - kennytm:rollup, r=kennytm

Browse source 
Rollup of 14 pull requests

- Successful merges: #46636, #46780, #46784, #46809, #46814, #46820, #46839, #46847, #46858, #46878, #46884, #46890, #46898, #46918
- Failed merges:
This commit is contained in:
bors 2017-12-21 23:01:27 +00:00
commit ba2741594b
40 changed files with 453 additions and 329 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustdoc/html/render.rs
View file

@ -3720,9 +3720,10 @@ fn sidebar_assoc_items(it: &clean::Item) -> String {
})).and_then(|did| c.impls.get(&did));
if let Some(impls) = inner_impl {
out.push_str("<a class=\"sidebar-title\" href=\"#deref-methods\">");
out.push_str(&format!("Methods from {:#}&lt;Target={:#}&gt;",
impl_.inner_impl().trait_.as_ref().unwrap(),
target));
out.push_str(&format!("Methods from {}&lt;Target={}&gt;",
Escape(&format!("{:#}",
impl_.inner_impl().trait_.as_ref().unwrap())),
Escape(&format!("{:#}", target))));
out.push_str("</a>");
let ret = impls.iter()
.filter(|i| i.inner_impl().trait_.is_none())