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

Rename generic_lifetime -> is_lifetime_generic

Browse Source
This commit is contained in:
Devin Ragotzy 2020-08-06 17:24:00 -04:00 committed by Jonas Platte
parent 1060d63057
commit b2d45e4748
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruma-api-macros/src/derive_outgoing.rs
View File

@ -147,7 +147,7 @@ fn strip_lifetimes(field_type: &mut Type) -> bool {
// The IncomingT has to be declared by the user of this derive macro. // The IncomingT has to be declared by the user of this derive macro.
Type::Path(TypePath { path, .. }) => { Type::Path(TypePath { path, .. }) => {
let mut has_lifetimes = false; let mut has_lifetimes = false;
let mut generic_lifetime = false; let mut is_lifetime_generic = false;
for seg in &mut path.segments { for seg in &mut path.segments {
// strip generic lifetimes // strip generic lifetimes
@ -168,7 +168,7 @@ fn strip_lifetimes(field_type: &mut Type) -> bool {
}) })
.filter(|arg| { .filter(|arg| {
if let GenericArgument::Lifetime(_) = arg { if let GenericArgument::Lifetime(_) = arg {
generic_lifetime = true; is_lifetime_generic = true;
false false
} else { } else {
true true
@ -195,14 +195,14 @@ fn strip_lifetimes(field_type: &mut Type) -> bool {
} }
// If a type has a generic lifetime parameter there must be an `Incoming` variant of that type. // If a type has a generic lifetime parameter there must be an `Incoming` variant of that type.
if generic_lifetime { if is_lifetime_generic {
if let Some(name) = path.segments.last_mut() { if let Some(name) = path.segments.last_mut() {
let incoming_ty_ident = format_ident!("Incoming{}", name.ident); let incoming_ty_ident = format_ident!("Incoming{}", name.ident);
name.ident = incoming_ty_ident; name.ident = incoming_ty_ident;
} }
} }
has_lifetimes || generic_lifetime has_lifetimes || is_lifetime_generic
} }
Type::Reference(TypeReference { elem, .. }) => match &mut **elem { Type::Reference(TypeReference { elem, .. }) => match &mut **elem {
Type::Path(ty_path) => { Type::Path(ty_path) => {