Skip to content

Commit 119a845

Browse files
committed
Rename fn to try_from_json_object
1 parent cb3dbfe commit 119a845

8 files changed

+93
-93
lines changed

crates/stackable-versioned-macros/src/codegen/container/struct/k8s.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ impl Struct {
180180

181181
#convert_method
182182

183-
fn from_json_value(object: #serde_json_path::Value) -> ::std::result::Result<Self, #parse_object_error> {
184-
let object_kind = object
183+
fn try_from_json_object(object_value: #serde_json_path::Value) -> ::std::result::Result<Self, #parse_object_error> {
184+
let object_kind = object_value
185185
.get("kind")
186186
.ok_or_else(|| #parse_object_error::FieldMissing{ field: "kind".to_owned() })?
187187
.as_str()
@@ -199,15 +199,15 @@ impl Struct {
199199
});
200200
}
201201

202-
let api_version = object
202+
let api_version = object_value
203203
.get("apiVersion")
204204
.ok_or_else(|| #parse_object_error::FieldMissing{ field: "apiVersion".to_owned() })?
205205
.as_str()
206206
.ok_or_else(|| #parse_object_error::FieldNotStr{ field: "apiVersion".to_owned() })?;
207207

208208
let object = match api_version {
209209
#(#api_versions => {
210-
let object = #serde_json_path::from_value(object)
210+
let object = #serde_json_path::from_value(object_value)
211211
.map_err(|source| #parse_object_error::Deserialize { source })?;
212212

213213
Self::#variant_idents(object)
@@ -478,7 +478,7 @@ impl Struct {
478478
for object in objects {
479479
// This clone is required because in the noop case we move the object into
480480
// the converted objects vec.
481-
let current_object = Self::from_json_value(object.clone())
481+
let current_object = Self::try_from_json_object(object.clone())
482482
.map_err(|source| #convert_object_error::Parse { source })?;
483483

484484
match (current_object, &desired_api_version) {

crates/stackable-versioned-macros/tests/snapshots/[email protected]

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/stackable-versioned-macros/tests/snapshots/stackable_versioned_macros__snapshot_tests__k8s@conversion_tracking.rs.snap

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/stackable-versioned-macros/tests/snapshots/stackable_versioned_macros__snapshot_tests__k8s@crate_overrides.rs.snap

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/stackable-versioned-macros/tests/snapshots/[email protected]

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)