bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #44969 - QuietMisdreavus:impls-for-everyone, r=steveklabnik

Browse source 
document trait impls when the type appears in the trait's generics

Fixes #25264

![image](https://user-images.githubusercontent.com/5217170/31062309-4fc7c594-a6ef-11e7-892e-07f95bbc7976.png)
This commit is contained in:
bors 2017-10-12 01:00:15 +00:00
commit fbb5054fa9
2 changed files with 34 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1306,7 +1306,8 @@ impl DocFolder for Cache {
// Figure out the id of this impl. This may map to a
// primitive rather than always to a struct/enum.
// Note: matching twice to restrict the lifetime of the `i` borrow.
let did = if let clean::Item { inner: clean::ImplItem(ref i), .. } = item {
let mut dids = vec![];
if let clean::Item { inner: clean::ImplItem(ref i), .. } = item {
let masked_trait = i.trait_.def_id().map_or(false,
|d| self.masked_crates.contains(&d.krate));
if !masked_trait {
@ -1315,23 +1316,33 @@ impl DocFolder for Cache {
clean::BorrowedRef {
type_: box clean::ResolvedPath { did, .. }, ..
} => {
Some(did)
dids.push(did);
}
ref t => {
t.primitive_type().and_then(|t| {
let did = t.primitive_type().and_then(|t| {
self.primitive_locations.get(&t).cloned()
})
});
if let Some(did) = did {
dids.push(did);
}
}
}
}
if let Some(generics) = i.trait_.as_ref().and_then(|t| t.generics()) {
for bound in generics {
if let Some(did) = bound.def_id() {
dids.push(did);
}
}
} else {
None
}
} else {
unreachable!()
};
if let Some(did) = did {
for did in dids {
self.impls.entry(did).or_insert(vec![]).push(Impl {
impl_item: item,
impl_item: item.clone(),
});
}
None