Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve detecting whether default can be derived #241

Merged
merged 8 commits into from
May 19, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Use default() for filling structs
Signed-off-by: Aaron Dewes <[email protected]>
  • Loading branch information
AaronDewes committed May 19, 2024
commit 767bbdde4a80f43e82babb48d32abbd1796bbf40
9 changes: 3 additions & 6 deletions src/analyzer.rs
Original file line number Diff line number Diff line change
@@ -5,10 +5,7 @@ use heck::ToUpperCamelCase;
use k8s_openapi::apiextensions_apiserver::pkg::apis::apiextensions::v1::{
JSONSchemaProps, JSONSchemaPropsOrArray, JSONSchemaPropsOrBool, JSON,
};
use std::{
cell::OnceCell,
collections::{BTreeMap, HashMap},
};
use std::collections::{BTreeMap, HashMap};

const IGNORED_KEYS: [&str; 3] = ["metadata", "apiVersion", "kind"];

@@ -228,7 +225,7 @@ fn analyze_enum_properties(
level,
docs: schema.description.clone(),
is_enum: true,
supports_derive_default: OnceCell::new(),
..Container::default()
})
}

@@ -337,7 +334,7 @@ fn extract_container(
level,
docs: schema.description.clone(),
is_enum: false,
supports_derive_default: OnceCell::new(),
..Container::default()
})
}

66 changes: 16 additions & 50 deletions src/output.rs
Original file line number Diff line number Diff line change
@@ -253,8 +253,6 @@ impl MapType {
// unit tests
#[cfg(test)]
mod test {
use std::cell::OnceCell;

use super::{Container, Member};
fn name_only_enum_member(name: &str) -> Member {
Member {
@@ -291,9 +289,8 @@ mod test {
name_only_enum_member("jwksUri"),
name_only_enum_member("JwksUri"),
],
docs: None,
is_enum: true,
supports_derive_default: OnceCell::new(),
..Container::default()
};

c.rename();
@@ -317,9 +314,7 @@ mod test {
name_only_int_member("jwksUri"),
name_only_int_member("JwksUri"),
],
docs: None,
is_enum: false,
supports_derive_default: OnceCell::new(),
..Container::default()
};
cs.rename();
assert_eq!(&cs.members[0].name, "jwks_uri");
@@ -334,102 +329,73 @@ mod test {
Container {
name: "Simple".to_string(),
level: 1,
members: vec![],
docs: None,
is_enum: false,
supports_derive_default: OnceCell::new(),
..Container::default()
},
Container {
name: "Enum".to_string(),
level: 1,
members: vec![],
docs: None,
is_enum: true,
supports_derive_default: OnceCell::new(),
..Container::default()
},
Container {
name: "Nested".to_string(),
level: 1,
members: vec![Member {
name: "simple".to_string(),
type_: "Simple".to_string(),
serde_annot: vec![],
extra_annot: vec![],
docs: None,
..Member::default()
}],
docs: None,
is_enum: false,
supports_derive_default: OnceCell::new(),
..Container::default()
},
Container {
name: "ReferencesEnum".to_string(),
level: 1,
members: vec![Member {
name: "enum".to_string(),
type_: "Enum".to_string(),
serde_annot: vec![],
extra_annot: vec![],
docs: None,
..Member::default()
}],
docs: None,
is_enum: false,
supports_derive_default: OnceCell::new(),
..Container::default()
},
Container {
name: "ReferencesEnumNested".to_string(),
level: 1,
members: vec![Member {
name: "references_enum".to_string(),
type_: "ReferencesEnum".to_string(),
serde_annot: vec![],
extra_annot: vec![],
docs: None,
..Member::default()
}],
docs: None,
is_enum: false,
supports_derive_default: OnceCell::new(),
..Container::default()
},
Container {
name: "ReferencesEnumOption".to_string(),
level: 1,
members: vec![Member {
name: "maybe_enum".to_string(),
type_: "Option<Enum>".to_string(),
serde_annot: vec![],
extra_annot: vec![],
docs: None,
..Member::default()
}],
docs: None,
is_enum: false,
supports_derive_default: OnceCell::new(),
..Container::default()
},
Container {
name: "ReferencesEnumVec".to_string(),
level: 1,
members: vec![Member {
name: "enum_list".to_string(),
type_: "Vec<Enum>".to_string(),
serde_annot: vec![],
extra_annot: vec![],
docs: None,
..Member::default()
}],
docs: None,
is_enum: false,
supports_derive_default: OnceCell::new(),
..Container::default()
},
Container {
name: "ReferencesEnumNestedOption".to_string(),
level: 1,
members: vec![Member {
name: "maybe_references_enum".to_string(),
type_: "Option<ReferencesEnum>".to_string(),
serde_annot: vec![],
extra_annot: vec![],
docs: None,
..Member::default()
}],
docs: None,
is_enum: false,
supports_derive_default: OnceCell::new(),
..Container::default()
},
];
assert!(containers[0].can_derive_default(&containers)); // Simple
Loading