Oapi: Enable required usage with schema_with attribute (#513)

* Enable required usage with schema_with attribute * wip
salvo-rs · Nov 27, 2023 · ddb457a · ddb457a
1 parent 1f79496
commit ddb457a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/crates/compression/src/lib.rs b/crates/compression/src/lib.rs
@@ -89,7 +89,7 @@ impl Display for CompressionAlgo {
             CompressionAlgo::Gzip => write!(f, "gzip"),
             #[cfg(feature = "zstd")]
             CompressionAlgo::Zstd => write!(f, "zstd"),
-            _ => write!(f, "unreached"),
+            _ => unreachable!(),
         }
     }
 }

diff --git a/crates/oapi-macros/src/schema/struct_schemas.rs b/crates/oapi-macros/src/schema/struct_schemas.rs
@@ -162,17 +162,15 @@ impl ToTokens for NamedStructSchema<'_> {
                                 .property(#name, #property)
                             });
 
-                            if let Property::Schema(_) = property {
-                                if (!is_option && crate::is_required(field_rule.as_ref(), container_rules.as_ref()))
-                                    || required
-                                        .as_ref()
-                                        .map(crate::feature::Required::is_true)
-                                        .unwrap_or(false)
-                                {
-                                    object_tokens.extend(quote! {
-                                        .required(#name)
-                                    })
-                                }
+                            if (!is_option && crate::is_required(field_rule.as_ref(), container_rules.as_ref()))
+                                || required
+                                    .as_ref()
+                                    .map(crate::feature::Required::is_true)
+                                    .unwrap_or(false)
+                            {
+                                object_tokens.extend(quote! {
+                                    .required(#name)
+                                })
                             }
 
                             object_tokens

diff --git a/crates/oapi/src/openapi/schema/mod.rs b/crates/oapi/src/openapi/schema/mod.rs
@@ -2,6 +2,8 @@
 //! used to define field properties, enum values, array or object types.
 //!
 //! [schema]: https://spec.openapis.org/oas/latest.html#schema-object
+use std::collections::BTreeMap;
+
 use serde::{Deserialize, Serialize};
 
 use crate::RefOr;