OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QuietMisdreavus 2017-10-01 21:25:48 -05:00
parent f1b5225e8b
commit 23f5fbee45
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/librustdoc/clean/mod.rs
View File

@ -1681,6 +1681,21 @@ impl Type {
_ => false
}
}
pub fn generics(&self) -> Option<&[Type]> {
match *self {
ResolvedPath { ref path, .. } => {
path.segments.last().and_then(|seg| {
if let PathParameters::AngleBracketed { ref types, .. } = seg.params {
Some(&**types)
} else {
None
}
})
}
_ => None,
}
}
}
impl GetDefId for Type {

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