Chore fix ToSchema refactoring aftermath

Fix some clippy lints. Move back to component super package so we will
not have package structure `schema/schema`.

Fix examples to use new structre in OpenApi derive
`#[components(schemas(..))]`.

examples/rocket-todo/src/main.rs

@@ -22,7 +22,9 @@ fn rocket() -> Rocket<Build> {
             todo::delete_todo,
             todo::search_todos
         ),
-        components(todo::Todo, todo::TodoError),
+        components(
+            schemas(todo::Todo, todo::TodoError)
+        ),
         tags(
             (name = "todo", description = "Todo management endpoints.")
         ),
@@ -82,7 +84,7 @@ mod todo {
         FromForm, Request, State,
     };
     use serde::{Deserialize, Serialize};
-    use utoipa::{ToSchema, IntoParams};
+    use utoipa::{IntoParams, ToSchema};
 
     pub(super) type TodoStore = Arc<Mutex<Vec<Todo>>>;
 

examples/todo-actix/src/main.rs

@@ -38,7 +38,9 @@ async fn main() -> Result<(), impl Error> {
             todo::update_todo,
             todo::search_todos
         ),
-        components(todo::Todo, todo::TodoUpdateRequest, todo::ErrorResponse),
+        components(
+            schemas(todo::Todo, todo::TodoUpdateRequest, todo::ErrorResponse)
+        ),
         tags(
             (name = "todo", description = "Todo management endpoints.")
         ),

examples/todo-axum/src/main.rs

@@ -24,7 +24,9 @@ async fn main() -> Result<(), Error> {
             todo::mark_done,
             todo::delete_todo,
         ),
-        components(todo::Todo, todo::TodoError),
+        components(
+            schemas(todo::Todo, todo::TodoError)
+        ),
         modifiers(&SecurityAddon),
         tags(
             (name = "todo", description = "Todo items management API")
@@ -74,7 +76,7 @@ mod todo {
     use hyper::{HeaderMap, StatusCode};
     use serde::{Deserialize, Serialize};
     use tokio::sync::Mutex;
-    use utoipa::{ToSchema, IntoParams};
+    use utoipa::{IntoParams, ToSchema};
 
     /// In-memonry todo store
     pub(super) type Store = Mutex<Vec<Todo>>;

examples/todo-tide/src/main.rs

@@ -24,7 +24,9 @@ async fn main() -> std::io::Result<()> {
             todo::delete_todo,
             todo::mark_done
         ),
-        components(todo::Todo, todo::TodoError),
+        components(
+            schemas(todo::Todo, todo::TodoError)
+        ),
         modifiers(&SecurityAddon),
         tags(
             (name = "todo", description = "Todo items management endpoints.")

examples/todo-warp/src/main.rs

@@ -21,7 +21,9 @@ async fn main() {
     #[derive(OpenApi)]
     #[openapi(
         handlers(todo::list_todos, todo::create_todo, todo::delete_todo),
-        components(todo::Todo),
+        components(
+            schemas(todo::Todo)
+        ),
         modifiers(&SecurityAddon),
         tags(
             (name = "todo", description = "Todo items management API")
@@ -96,7 +98,7 @@ mod todo {
     };
 
     use serde::{Deserialize, Serialize};
-    use utoipa::{ToSchema, IntoParams};
+    use utoipa::{IntoParams, ToSchema};
     use warp::{hyper::StatusCode, Filter, Reply};
 
     pub type Store = Arc<Mutex<Vec<Todo>>>;

src/openapi/schema.rs

@@ -732,6 +732,7 @@ impl ToArray for Ref {}
 
 /// A [`Ref`] or some other type `T`
 #[derive(Serialize, Deserialize, Clone)]
+#[cfg_attr(feature = "debug", derive(Debug))]
 #[serde(untagged)]
 pub enum RefOr<T> {
     Ref(Ref),

utoipa-gen/src/schema/schema/attr.rs → utoipa-gen/src/component/schema/attr.rs

@@ -6,8 +6,8 @@ use quote::{quote, ToTokens};
 use syn::{parenthesized, parse::Parse, Attribute, Error, Token};
 
 use crate::{
+    component::{GenericType, TypeTree},
     parse_utils,
-    schema::{GenericType, TypeTree},
     schema_type::SchemaFormat,
     AnyValue,
 };
@@ -331,7 +331,7 @@ impl<'c> SchemaAttr<NamedField<'c>> {
 fn is_valid_xml_attr(attrs: &SchemaAttr<NamedField>, component_part: &TypeTree) {
     if !matches!(
         component_part.generic_type,
-        Some(crate::schema::GenericType::Vec)
+        Some(crate::component::GenericType::Vec)
     ) {
         if let Some(wrapped_ident) = attrs
             .as_ref()

utoipa-gen/src/ext.rs

@@ -139,9 +139,9 @@ pub mod fn_arg {
     use quote::quote;
     use syn::{punctuated::Punctuated, token::Comma, PatType, TypePath};
 
-    use crate::schema::TypeTree;
+    use crate::component::TypeTree;
     #[cfg(any(feature = "actix_extras", feature = "axum_extras"))]
-    use crate::schema::ValueType;
+    use crate::component::ValueType;
 
     use super::IntoParamsType;
 

utoipa-gen/src/ext/actix.rs

@@ -7,9 +7,9 @@ use regex::{Captures, Regex};
 use syn::{parse::Parse, punctuated::Punctuated, token::Comma, ItemFn, LitStr};
 
 use crate::{
+    component::{TypeTree, ValueType},
     ext::ArgValue,
     path::PathOperation,
-    schema::{TypeTree, ValueType},
 };
 
 use super::{

utoipa-gen/src/ext/rocket.rs

@@ -8,9 +8,9 @@ use regex::{Captures, Regex};
 use syn::{parse::Parse, LitStr, Token, TypePath};
 
 use crate::{
+    component::{GenericType, TypeTree, ValueType},
     ext::{ArgValue, ArgumentIn, IntoParamsType, MacroArg, ValueArgument},
     path::PathOperation,
-    schema::{GenericType, TypeTree, ValueType},
 };
 
 use super::{

utoipa-gen/src/lib.rs

@@ -9,15 +9,15 @@
 
 use std::{borrow::Cow, mem, ops::Deref};
 
+use component::schema::Schema;
 use doc_comment::CommentAttributes;
-use schema::schema::Schema;
 
+use component::into_params::IntoParams;
 use ext::{PathOperationResolver, PathOperations, PathResolver};
 use openapi::OpenApi;
 use proc_macro::TokenStream;
 use proc_macro_error::{proc_macro_error, OptionExt, ResultExt};
 use quote::{quote, ToTokens, TokenStreamExt};
-use schema::into_params::IntoParams;
 
 use proc_macro2::{Group, Ident, Punct, TokenStream as TokenStream2};
 use syn::{
@@ -28,11 +28,11 @@ use syn::{
     PathArguments, PathSegment, Token, TypePath,
 };
 
+mod component;
 mod doc_comment;
 mod ext;
 mod openapi;
 mod path;
-mod schema;
 mod schema_type;
 mod security_requirement;
 

utoipa-gen/src/openapi.rs

@@ -13,7 +13,7 @@ use proc_macro2::TokenStream;
 use quote::{format_ident, quote, quote_spanned, ToTokens};
 
 use crate::{
-    parse_utils, path::PATH_STRUCT_PREFIX, schema::schema,
+    component::schema, parse_utils, path::PATH_STRUCT_PREFIX,
     security_requirement::SecurityRequirementAttr, Array, ExternalDocs,
 };
 
@@ -301,7 +301,7 @@ struct Components {
 
 impl Parse for Components {
     fn parse(input: ParseStream) -> syn::Result<Self> {
-        let mut content;
+        let content;
         parenthesized!(content in input);
         const EXPECTED_ATTRIBUTE: &str =
             "unexpected attribute. expected one of: schemas, responses";
@@ -318,13 +318,13 @@ impl Parse for Components {
             match attribute {
                 "schemas" => {
                     let punctuated: Punctuated<Schema, Comma> =
-                        parse_utils::parse_punctuated_within_parenthesis(&mut content)?;
+                        parse_utils::parse_punctuated_within_parenthesis(&content)?;
                     let mut v: Vec<Schema> = punctuated.into_iter().collect();
                     schemas.append(&mut v)
                 }
                 "responses" => {
                     let punctuated: Punctuated<Responses, Comma> =
-                        parse_utils::parse_punctuated_within_parenthesis(&mut content)?;
+                        parse_utils::parse_punctuated_within_parenthesis(&content)?;
                     let mut v: Vec<Responses> = punctuated.into_iter().collect();
                     responses.append(&mut v)
                 }

utoipa-gen/src/path/parameter.rs

@@ -15,7 +15,7 @@ use syn::{
 ))]
 use crate::ext::{ArgumentIn, ValueArgument};
 use crate::{
-    parse_utils, schema::into_params::FieldParamContainerAttributes, AnyValue, Deprecated,
+    component::into_params::FieldParamContainerAttributes, parse_utils, AnyValue, Deprecated,
     Required, Type,
 };
 

utoipa-gen/src/path/property.rs

@@ -2,7 +2,7 @@ use quote::{quote, quote_spanned, ToTokens};
 use syn::spanned::Spanned;
 
 use crate::{
-    schema::schema,
+    component::schema,
     schema_type::{SchemaFormat, SchemaType},
     Type,
 };

utoipa-gen/src/path/response.rs

@@ -13,6 +13,7 @@ use crate::{parse_utils, AnyValue, Type};
 
 use super::{property::Property, ContentTypeResolver};
 
+#[cfg_attr(feature = "debug", derive(Debug))]
 pub enum Response<'r> {
     /// A type that implements `utoipa::IntoResponses`.
     IntoResponses(ExprPath),