chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add semicolons and the other possible syn::Type types

Browse Source
This commit is contained in:
Devin Ragotzy 2020-08-06 14:55:21 -04:00 committed by Jonas Platte
parent 1336cd8c41
commit 5103baeb4b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ruma-api-macros/src/util.rs
View File

@ -5,7 +5,8 @@ use quote::quote;
use std::collections::BTreeSet; use std::collections::BTreeSet;
use syn::{ use syn::{
AngleBracketedGenericArguments, GenericArgument, Ident, Lifetime, AngleBracketedGenericArguments, GenericArgument, Ident, Lifetime,
ParenthesizedGenericArguments, PathArguments, Type, TypePath, TypeReference, ParenthesizedGenericArguments, PathArguments, Type, TypeGroup, TypeParen, TypePath,
TypeReference, TypeTuple,
}; };
use crate::api::{metadata::Metadata, request::Request}; use crate::api::{metadata::Metadata, request::Request};
@ -20,7 +21,7 @@ pub fn collect_lifetime_ident(lifetimes: &mut BTreeSet<Lifetime>, ty: &Type) {
}) => { }) => {
for gen in args { for gen in args {
if let GenericArgument::Type(ty) = gen { if let GenericArgument::Type(ty) = gen {
collect_lifetime_ident(lifetimes, &ty) collect_lifetime_ident(lifetimes, &ty);
} else if let GenericArgument::Lifetime(lt) = gen { } else if let GenericArgument::Lifetime(lt) = gen {
lifetimes.insert(lt.clone()); lifetimes.insert(lt.clone());
} }
@ -30,7 +31,7 @@ pub fn collect_lifetime_ident(lifetimes: &mut BTreeSet<Lifetime>, ty: &Type) {
inputs, .. inputs, ..
}) => { }) => {
for ty in inputs { for ty in inputs {
collect_lifetime_ident(lifetimes, ty) collect_lifetime_ident(lifetimes, ty);
} }
} }
_ => {} _ => {}
@ -43,11 +44,13 @@ pub fn collect_lifetime_ident(lifetimes: &mut BTreeSet<Lifetime>, ty: &Type) {
lifetimes.insert(lt.clone()); lifetimes.insert(lt.clone());
} }
} }
Type::Tuple(syn::TypeTuple { elems, .. }) => { Type::Tuple(TypeTuple { elems, .. }) => {
for ty in elems { for ty in elems {
collect_lifetime_ident(lifetimes, ty) collect_lifetime_ident(lifetimes, ty);
} }
} }
Type::Paren(TypeParen { elem, .. }) => collect_lifetime_ident(lifetimes, &*elem),
Type::Group(TypeGroup { elem, .. }) => collect_lifetime_ident(lifetimes, &*elem),
_ => {} _ => {}
} }
} }