mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid repeated trait bounds in derived impls

Browse Source
This commit is contained in:
Florian Hartwig 2015-07-20 00:09:12 +02:00
parent a41178e858
commit 93e5a74c87
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libsyntax/ext/deriving/generic/mod.rs
View File

@ -188,6 +188,7 @@ pub use self::SubstructureFields::*;
use self::StructType::*;
use std::cell::RefCell;
use std::collections::HashSet;
use std::vec;
use abi::Abi;
@ -549,10 +550,20 @@ impl<'a> TraitDef<'a> {
.map(|ty_param| ty_param.ident.name)
.collect();
let mut processed_field_types = HashSet::new();
for field_ty in field_tys {
let tys = find_type_parameters(&*field_ty, &ty_param_names);
for ty in tys {
// if we have already handled this type, skip it
if let ast::TyPath(_, ref p) = ty.node {
if p.segments.len() == 1
&& ty_param_names.contains(&p.segments[0].identifier.name)
|| processed_field_types.contains(&p.segments) {
continue;
};
processed_field_types.insert(p.segments.clone());
}
let mut bounds: Vec<_> = self.additional_bounds.iter().map(|p| {
cx.typarambound(p.to_path(cx, self.span, type_ident, generics))
}).collect();