From 841011f4e5be3c0e530722f77726487548e21215 Mon Sep 17 00:00:00 2001 From: clux Date: Thu, 7 Mar 2024 21:17:31 +0000 Subject: [PATCH] clippy Signed-off-by: clux --- src/analyzer.rs | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/analyzer.rs b/src/analyzer.rs index 27dfa59..a21155e 100644 --- a/src/analyzer.rs +++ b/src/analyzer.rs @@ -272,7 +272,7 @@ fn extract_container( // recurse through repeated arrays until we find a concrete type (keep track of how deep we went) let (mut array_type, recurse_level) = array_recurse_for_type(value, stack, key, 1)?; trace!("got array {} for {} in level {}", array_type, key, recurse_level); - if !cfg.no_condition && key == "conditions" && is_conditions(&value) { + if !cfg.no_condition && key == "conditions" && is_conditions(value) { array_type = "Vec".into(); } else { array_recurse_level.insert(key.clone(), recurse_level); @@ -452,20 +452,18 @@ fn array_recurse_for_type( // ---------------------------------------------------------------------------- // helpers fn is_conditions(value: &JSONSchemaProps) -> bool { - if let Some(items) = &value.items { - if let JSONSchemaPropsOrArray::Schema(props) = &items { - if let Some(p) = &props.properties { - let type_ = p.get("type"); - let status = p.get("status"); - let reason = p.get("reason"); - let message = p.get("message"); - let ltt = p.get("lastTransitionTime"); - return type_.is_some() - && status.is_some() - && reason.is_some() - && message.is_some() - && ltt.is_some(); - } + if let Some(JSONSchemaPropsOrArray::Schema(props)) = &value.items { + if let Some(p) = &props.properties { + let type_ = p.get("type"); + let status = p.get("status"); + let reason = p.get("reason"); + let message = p.get("message"); + let ltt = p.get("lastTransitionTime"); + return type_.is_some() + && status.is_some() + && reason.is_some() + && message.is_some() + && ltt.is_some(); } } false