diff --git a/ruma-api-macros/src/api/request.rs b/ruma-api-macros/src/api/request.rs index e8588b4d..a05c1e35 100644 --- a/ruma-api-macros/src/api/request.rs +++ b/ruma-api-macros/src/api/request.rs @@ -15,7 +15,7 @@ use crate::{ }; #[derive(Debug, Default)] -pub struct RequetLifetimes { +pub struct RequestLifetimes { body: BTreeSet, path: BTreeSet, query: BTreeSet, @@ -28,7 +28,7 @@ pub struct Request { fields: Vec, /// The collected lifetime identifiers from the declared fields. - lifetimes: RequetLifetimes, + lifetimes: RequestLifetimes, } impl Request { @@ -252,7 +252,7 @@ impl TryFrom for Request { fn try_from(raw: RawRequest) -> syn::Result { let mut newtype_body_field = None; let mut query_map_field = None; - let mut lifetimes = RequetLifetimes::default(); + let mut lifetimes = RequestLifetimes::default(); let fields = raw .fields @@ -323,13 +323,13 @@ impl TryFrom for Request { } match field_kind.unwrap_or(RequestFieldKind::Body) { - RequestFieldKind::Header => util::copy_lifetime_ident(&mut lifetimes.header, &field.ty), - RequestFieldKind::Body => util::copy_lifetime_ident(&mut lifetimes.body, &field.ty), - RequestFieldKind::NewtypeBody => util::copy_lifetime_ident(&mut lifetimes.body, &field.ty), - RequestFieldKind::NewtypeRawBody => util::copy_lifetime_ident(&mut lifetimes.body, &field.ty), - RequestFieldKind::Path => util::copy_lifetime_ident(&mut lifetimes.path, &field.ty), - RequestFieldKind::Query => util::copy_lifetime_ident(&mut lifetimes.query, &field.ty), - RequestFieldKind::QueryMap => util::copy_lifetime_ident(&mut lifetimes.query, &field.ty), + RequestFieldKind::Header => util::collect_lifetime_ident(&mut lifetimes.header, &field.ty), + RequestFieldKind::Body => util::collect_lifetime_ident(&mut lifetimes.body, &field.ty), + RequestFieldKind::NewtypeBody => util::collect_lifetime_ident(&mut lifetimes.body, &field.ty), + RequestFieldKind::NewtypeRawBody => util::collect_lifetime_ident(&mut lifetimes.body, &field.ty), + RequestFieldKind::Path => util::collect_lifetime_ident(&mut lifetimes.path, &field.ty), + RequestFieldKind::Query => util::collect_lifetime_ident(&mut lifetimes.query, &field.ty), + RequestFieldKind::QueryMap => util::collect_lifetime_ident(&mut lifetimes.query, &field.ty), } Ok(RequestField::new( diff --git a/ruma-api-macros/src/api/response.rs b/ruma-api-macros/src/api/response.rs index 2b19347e..839d6b86 100644 --- a/ruma-api-macros/src/api/response.rs +++ b/ruma-api-macros/src/api/response.rs @@ -248,19 +248,19 @@ impl TryFrom for Response { Ok(match field_kind.unwrap_or(ResponseFieldKind::Body) { ResponseFieldKind::Body => { - util::copy_lifetime_ident(&mut lifetimes.body, &field.ty); + util::collect_lifetime_ident(&mut lifetimes.body, &field.ty); ResponseField::Body(field) } ResponseFieldKind::Header => { - util::copy_lifetime_ident(&mut lifetimes.header, &field.ty); + util::collect_lifetime_ident(&mut lifetimes.header, &field.ty); ResponseField::Header(field, header.expect("missing header name")) } ResponseFieldKind::NewtypeBody => { - util::copy_lifetime_ident(&mut lifetimes.body, &field.ty); + util::collect_lifetime_ident(&mut lifetimes.body, &field.ty); ResponseField::NewtypeBody(field) } ResponseFieldKind::NewtypeRawBody => { - util::copy_lifetime_ident(&mut lifetimes.body, &field.ty); + util::collect_lifetime_ident(&mut lifetimes.body, &field.ty); ResponseField::NewtypeRawBody(field) } }) diff --git a/ruma-api-macros/src/util.rs b/ruma-api-macros/src/util.rs index c3ff993d..8aecaa57 100644 --- a/ruma-api-macros/src/util.rs +++ b/ruma-api-macros/src/util.rs @@ -10,7 +10,7 @@ use syn::{ use crate::api::{metadata::Metadata, request::Request}; -pub fn copy_lifetime_ident(lifetimes: &mut BTreeSet, ty: &Type) { +pub fn collect_lifetime_ident(lifetimes: &mut BTreeSet, ty: &Type) { match ty { Type::Path(TypePath { path, .. }) => { for seg in &path.segments { @@ -20,7 +20,7 @@ pub fn copy_lifetime_ident(lifetimes: &mut BTreeSet, ty: &Type) { }) => { for gen in args { if let GenericArgument::Type(ty) = gen { - copy_lifetime_ident(lifetimes, &ty) + collect_lifetime_ident(lifetimes, &ty) } else if let GenericArgument::Lifetime(lt) = gen { lifetimes.insert(lt.clone()); } @@ -30,7 +30,7 @@ pub fn copy_lifetime_ident(lifetimes: &mut BTreeSet, ty: &Type) { inputs, .. }) => { for ty in inputs { - copy_lifetime_ident(lifetimes, ty) + collect_lifetime_ident(lifetimes, ty) } } _ => {} @@ -38,7 +38,7 @@ pub fn copy_lifetime_ident(lifetimes: &mut BTreeSet, ty: &Type) { } } Type::Reference(TypeReference { elem, lifetime, .. }) => { - copy_lifetime_ident(lifetimes, &*elem); + collect_lifetime_ident(lifetimes, &*elem); if let Some(lt) = lifetime { lifetimes.insert(lt.clone()); } diff --git a/ruma-api/tests/ruma_api_lifetime.rs b/ruma-api/tests/ruma_api_lifetime.rs index 4404d51a..957d0131 100644 --- a/ruma-api/tests/ruma_api_lifetime.rs +++ b/ruma-api/tests/ruma_api_lifetime.rs @@ -30,7 +30,6 @@ mod empty_response { } response: {} - } } @@ -56,7 +55,6 @@ mod nested_types { } response: {} - } }