Skip to content

Add StaticTypeInfo convenience trait #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ascjones merged 9 commits into from
May 19, 2021
Merged

Add StaticTypeInfo convenience trait #91

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4d3b9f6
Add 'static bound to `TypeInfo` trait
ascjones May 17, 2021
cef6e74
Remove some more static bounds
ascjones May 18, 2021
d8ec489
Add basic test for struct with lifetime
ascjones May 18, 2021
39901fe
Add StaticTypeInfo trait
ascjones May 19, 2021
7556064
Revert adding 'static to TypeInfo
ascjones May 19, 2021
73ea38f
Use StaticTypeInfo in derive macro
ascjones May 19, 2021
fb21eb9
Fmt
ascjones May 19, 2021
c2c783f
Revert "Use StaticTypeInfo in derive macro"
ascjones May 19, 2021
6e6d7ad
Update src/lib.rs
ascjones May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use StaticTypeInfo in derive macro
  • Loading branch information
@ascjones
ascjones committed May 19, 2021
commit 73ea38f5fd8a8429a2c711ec93993401861bc54d
9 changes: 4 additions & 5 deletions derive/src/trait_bounds.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,26 +66,25 @@ pub fn make_where_clause<'a>(

types.into_iter().for_each(|(ty, is_compact)| {
// Compact types need extra bounds, T: HasCompact and <T as
// HasCompact>::Type: TypeInfo + 'static
// HasCompact>::Type: StaticTypeInfo
if is_compact {
where_clause
.predicates
.push(parse_quote!(#ty : :: #parity_scale_codec ::HasCompact));
where_clause
.predicates
.push(parse_quote!(<#ty as :: #parity_scale_codec ::HasCompact>::Type : :: #scale_info ::TypeInfo + 'static));
.push(parse_quote!(<#ty as :: #parity_scale_codec ::HasCompact>::Type : :: #scale_info ::StaticTypeInfo));
} else {
where_clause
.predicates
.push(parse_quote!(#ty : :: #scale_info ::TypeInfo + 'static));
.push(parse_quote!(#ty : :: #scale_info ::StaticTypeInfo));
}
});

generics.type_params().into_iter().for_each(|type_param| {
let ident = type_param.ident.clone();
let mut bounds = type_param.bounds.clone();
bounds.push(parse_quote!(:: #scale_info ::TypeInfo));
bounds.push(parse_quote!('static));
bounds.push(parse_quote!(:: #scale_info ::StaticTypeInfo));
where_clause
.predicates
.push(parse_quote!( #ident : #bounds));
Expand Down