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

Fix typo and rename copy_lifetime_ident -> collect_lifetime_ident

Browse Source
This commit is contained in:
Devin Ragotzy 2020-08-06 10:59:22 -04:00 committed by Jonas Platte
parent f67744bb4f
commit 4e2f1a19e1
4 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ruma-api-macros/src/api/request.rs
View File

@ -15,7 +15,7 @@ use crate::{
}; };
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub struct RequetLifetimes { pub struct RequestLifetimes {
body: BTreeSet<Lifetime>, body: BTreeSet<Lifetime>,
path: BTreeSet<Lifetime>, path: BTreeSet<Lifetime>,
query: BTreeSet<Lifetime>, query: BTreeSet<Lifetime>,
@ -28,7 +28,7 @@ pub struct Request {
fields: Vec<RequestField>, fields: Vec<RequestField>,
/// The collected lifetime identifiers from the declared fields. /// The collected lifetime identifiers from the declared fields.
lifetimes: RequetLifetimes, lifetimes: RequestLifetimes,
} }
impl Request { impl Request {
@ -252,7 +252,7 @@ impl TryFrom<RawRequest> for Request {
fn try_from(raw: RawRequest) -> syn::Result<Self> { fn try_from(raw: RawRequest) -> syn::Result<Self> {
let mut newtype_body_field = None; let mut newtype_body_field = None;
let mut query_map_field = None; let mut query_map_field = None;
let mut lifetimes = RequetLifetimes::default(); let mut lifetimes = RequestLifetimes::default();
let fields = raw let fields = raw
.fields .fields
@ -323,13 +323,13 @@ impl TryFrom<RawRequest> for Request {
} }
match field_kind.unwrap_or(RequestFieldKind::Body) { match field_kind.unwrap_or(RequestFieldKind::Body) {
RequestFieldKind::Header => util::copy_lifetime_ident(&mut lifetimes.header, &field.ty), RequestFieldKind::Header => util::collect_lifetime_ident(&mut lifetimes.header, &field.ty),
RequestFieldKind::Body => util::copy_lifetime_ident(&mut lifetimes.body, &field.ty), RequestFieldKind::Body => util::collect_lifetime_ident(&mut lifetimes.body, &field.ty),
RequestFieldKind::NewtypeBody => util::copy_lifetime_ident(&mut lifetimes.body, &field.ty), RequestFieldKind::NewtypeBody => util::collect_lifetime_ident(&mut lifetimes.body, &field.ty),
RequestFieldKind::NewtypeRawBody => util::copy_lifetime_ident(&mut lifetimes.body, &field.ty), RequestFieldKind::NewtypeRawBody => util::collect_lifetime_ident(&mut lifetimes.body, &field.ty),
RequestFieldKind::Path => util::copy_lifetime_ident(&mut lifetimes.path, &field.ty), RequestFieldKind::Path => util::collect_lifetime_ident(&mut lifetimes.path, &field.ty),
RequestFieldKind::Query => util::copy_lifetime_ident(&mut lifetimes.query, &field.ty), RequestFieldKind::Query => util::collect_lifetime_ident(&mut lifetimes.query, &field.ty),
RequestFieldKind::QueryMap => util::copy_lifetime_ident(&mut lifetimes.query, &field.ty), RequestFieldKind::QueryMap => util::collect_lifetime_ident(&mut lifetimes.query, &field.ty),
} }
Ok(RequestField::new( Ok(RequestField::new(

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

@ -248,19 +248,19 @@ impl TryFrom<RawResponse> for Response {
Ok(match field_kind.unwrap_or(ResponseFieldKind::Body) { Ok(match field_kind.unwrap_or(ResponseFieldKind::Body) {
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) ResponseField::Body(field)
} }
ResponseFieldKind::Header => { 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")) ResponseField::Header(field, header.expect("missing header name"))
} }
ResponseFieldKind::NewtypeBody => { ResponseFieldKind::NewtypeBody => {
util::copy_lifetime_ident(&mut lifetimes.body, &field.ty); util::collect_lifetime_ident(&mut lifetimes.body, &field.ty);
ResponseField::NewtypeBody(field) ResponseField::NewtypeBody(field)
} }
ResponseFieldKind::NewtypeRawBody => { ResponseFieldKind::NewtypeRawBody => {
util::copy_lifetime_ident(&mut lifetimes.body, &field.ty); util::collect_lifetime_ident(&mut lifetimes.body, &field.ty);
ResponseField::NewtypeRawBody(field) ResponseField::NewtypeRawBody(field)
} }
}) })

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

@ -10,7 +10,7 @@ use syn::{
use crate::api::{metadata::Metadata, request::Request}; use crate::api::{metadata::Metadata, request::Request};
pub fn copy_lifetime_ident(lifetimes: &mut BTreeSet<Lifetime>, ty: &Type) { pub fn collect_lifetime_ident(lifetimes: &mut BTreeSet<Lifetime>, ty: &Type) {
match ty { match ty {
Type::Path(TypePath { path, .. }) => { Type::Path(TypePath { path, .. }) => {
for seg in &path.segments { for seg in &path.segments {
@ -20,7 +20,7 @@ pub fn copy_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 {
copy_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 +30,7 @@ pub fn copy_lifetime_ident(lifetimes: &mut BTreeSet<Lifetime>, ty: &Type) {
inputs, .. inputs, ..
}) => { }) => {
for ty in 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<Lifetime>, ty: &Type) {
} }
} }
Type::Reference(TypeReference { elem, lifetime, .. }) => { Type::Reference(TypeReference { elem, lifetime, .. }) => {
copy_lifetime_ident(lifetimes, &*elem); collect_lifetime_ident(lifetimes, &*elem);
if let Some(lt) = lifetime { if let Some(lt) = lifetime {
lifetimes.insert(lt.clone()); lifetimes.insert(lt.clone());
} }

2
ruma-api/tests/ruma_api_lifetime.rs
View File

@ -30,7 +30,6 @@ mod empty_response {
} }
response: {} response: {}
} }
} }
@ -56,7 +55,6 @@ mod nested_types {
} }
response: {} response: {}
} }
} }