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

Name type_params consistently with Syn

Browse Source
This commit is contained in:
David Tolnay 2018-04-12 22:04:34 -07:00
parent ec773fb7db
commit f06001c086
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
serde_derive/src/bound.rs
View File

@ -116,11 +116,11 @@ where
struct FindTyParams {
// Set of all generic type parameters on the current struct (A, B, C in
// the example). Initialized up front.
all_ty_params: HashSet<syn::Ident>,
all_type_params: HashSet<syn::Ident>,
// Set of generic type parameters used in fields for which filter
// returns true (A and B in the example). Filled in as the visitor sees
// them.
relevant_ty_params: HashSet<syn::Ident>,
relevant_type_params: HashSet<syn::Ident>,
}
impl<'ast> visit::Visit<'ast> for FindTyParams {
fn visit_path(&mut self, path: &syn::Path) {
@ -133,8 +133,8 @@ where
}
if path.leading_colon.is_none() && path.segments.len() == 1 {
let id = path.segments[0].ident;
if self.all_ty_params.contains(&id) {
self.relevant_ty_params.insert(id);
if self.all_type_params.contains(&id) {
self.relevant_type_params.insert(id);
}
}
visit::visit_path(self, path);
@ -149,13 +149,13 @@ where
fn visit_macro(&mut self, _mac: &syn::Macro) {}
}
let all_ty_params = generics.type_params()
let all_type_params = generics.type_params()
.map(|param| param.ident)
.collect();
let mut visitor = FindTyParams {
all_ty_params: all_ty_params,
relevant_ty_params: HashSet::new(),
all_type_params: all_type_params,
relevant_type_params: HashSet::new(),
};
match cont.data {
Data::Enum(ref variants) => for variant in variants.iter() {
@ -176,7 +176,7 @@ where
let new_predicates = generics.type_params()
.map(|param| param.ident)
.filter(|id| visitor.relevant_ty_params.contains(id))
.filter(|id| visitor.relevant_type_params.contains(id))
.map(|id| {
syn::WherePredicate::Type(syn::PredicateType {
lifetimes: None,