Clean up & clippy lint

juhaku · Mar 16, 2023 · 43d3457 · 43d3457
1 parent f7dfff8
commit 43d3457
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/utoipa-gen/src/component/schema.rs b/utoipa-gen/src/component/schema.rs
@@ -369,25 +369,8 @@ impl ToTokens for NamedStructSchema<'_> {
                             .property(#name, #property)
                         });
 
-                        // Named struct field is considered required if
-                        //   * it does not have `skip_serializing_if` property
-                        //   * and it does not have `serde_with` douple_option
-                        //   * and it does not have default value provided with serde `default`
-                        //     attribute
                         if let Property::Schema(_) = property {
-                            if !field_rule
-                                .as_ref()
-                                .map(|rule| rule.skip_serializing_if)
-                                .unwrap_or(false)
-                                && !field_rule
-                                    .as_ref()
-                                    .map(|rule| rule.double_option)
-                                    .unwrap_or(false)
-                                && !super::is_default(
-                                    &container_rules.as_ref(),
-                                    &field_rule.as_ref(),
-                                )
-                            {
+                            if super::is_required(field_rule.as_ref(), container_rules.as_ref()) {
                                 object_tokens.extend(quote! {
                                     .required(#name)
                                 })

diff --git a/utoipa/src/openapi/schema.rs b/utoipa/src/openapi/schema.rs
@@ -1429,7 +1429,7 @@ mod tests {
     }
 
     fn get_json_path<'a>(value: &'a Value, path: &str) -> &'a Value {
-        path.split('.').into_iter().fold(value, |acc, fragment| {
+        path.split('.').fold(value, |acc, fragment| {
             acc.get(fragment).unwrap_or(&serde_json::value::Value::Null)
         })
     }