bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Eliminate ty::Generics::types()

Browse source 
And with one final incanation, the specific kind iterators were banished from ty::Generics, never to be seen again!
This commit is contained in:
varkor 2018-04-14 19:20:51 +01:00
parent d557ff983f
commit 0b8b14f6f5
9 changed files with 52 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/librustdoc/clean/mod.rs
View file

@ -1800,12 +1800,16 @@ impl<'a, 'tcx> Clean<Generics> for (&'a ty::Generics,
// Bounds in the type_params and lifetimes fields are repeated in the
// predicates field (see rustc_typeck::collect::ty_generics), so remove
// them.
let stripped_typarams = gens.types_depr().filter_map(|tp| {
if tp.name == keywords::SelfType.name().as_str() {
assert_eq!(tp.index, 0);
None
let stripped_typarams = gens.params.iter().filter_map(|param| {
if let ty::GenericParamDef::Type(ty) = param {
if ty.name == keywords::SelfType.name().as_str() {
assert_eq!(ty.index, 0);
None
} else {
Some(ty.clean(cx))
}
} else {
Some(tp.clean(cx))
None
}
}).collect::<Vec<_>>();