msrd0/deprecated-gotham-restful
1
0
Fork 0
mirror of https://gitlab.com/msrd0/gotham-restful.git synced 2025-02-23 04:52:28 +00:00
Code Issues Releases Activity Actions

don't loose dependencies

Browse source
This commit is contained in:
Dominic 2019-10-03 00:41:29 +02:00
parent 74ea1b820b
commit 46372dee60
Signed by: msrd0
GPG key ID: DCC8C247452E98F9
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
example/src/main.rs
View file

@ -26,17 +26,16 @@ rest_resource!{Users, route => {
}} }}
#[derive(Deserialize, OpenapiType, Serialize)] #[derive(Deserialize, OpenapiType, Serialize)]
enum TestEnum struct TestStruct
{ {
Foo, foo : String
Bar
} }
#[derive(Deserialize, OpenapiType, Serialize)] #[derive(Deserialize, OpenapiType, Serialize)]
struct User struct User
{ {
username : String, username : String,
test : Option<TestEnum> test : Option<Vec<TestStruct>>
} }
impl ResourceReadAll<Success<Vec<Option<User>>>> for Users impl ResourceReadAll<Success<Vec<Option<User>>>> for Users

2
gotham_restful/src/openapi/types.rs
View file

@ -156,7 +156,7 @@ impl<T : OpenapiType> OpenapiType for Vec<T>
fn to_schema() -> OpenapiSchema fn to_schema() -> OpenapiSchema
{ {
let schema = T::to_schema(); let schema = T::to_schema();
let mut dependencies : IndexMap<String, OpenapiSchema> = IndexMap::new(); let mut dependencies = schema.dependencies.clone();
let items = if let Some(name) = schema.name.clone() let items = if let Some(name) = schema.name.clone()
{ {

10
gotham_restful_derive/src/openapi_type.rs
View file

@ -84,6 +84,16 @@ fn expand_field(field : &Field) -> TokenStream2
required.push(stringify!(#ident).to_string()); required.push(stringify!(#ident).to_string());
} }
let keys : Vec<String> = schema.dependencies.keys().map(|k| k.to_string()).collect();
for dep in keys
{
let dep_schema = schema.dependencies.swap_remove(&dep);
if let Some(dep_schema) = dep_schema
{
dependencies.insert(dep, dep_schema);
}
}
match schema.name.clone() { match schema.name.clone() {
Some(name) => { Some(name) => {
properties.insert( properties.insert(