Rename gen module to generate

crates/aide-axum-typed-multipart/src/lib.rs

@@ -3,7 +3,7 @@
 use std::ops::Deref;
 
 use aide::{
-    gen::GenContext,
+    generate::GenContext,
     openapi::{MediaType, Operation, RequestBody, SchemaObject},
     operation::set_body,
     OperationInput,

crates/aide-macros/src/lib.rs

@@ -125,7 +125,7 @@ pub fn derive_operation_io(ts: TokenStream) -> TokenStream {
             ts.extend(quote! {
                 impl #i_gen aide::OperationInput for #name #t_gen #w_gen {
                     fn operation_input(
-                        ctx: &mut aide::gen::GenContext,
+                        ctx: &mut aide::generate::GenContext,
                         operation: &mut aide::openapi::Operation
                     ) {
                         <#input as aide::OperationInput>::operation_input(
@@ -142,7 +142,7 @@ pub fn derive_operation_io(ts: TokenStream) -> TokenStream {
                 impl #i_gen aide::OperationOutput for #name #t_gen #w_gen {
                     type Inner = <#output as aide::OperationOutput>::Inner;
                     fn operation_response(
-                        ctx: &mut aide::gen::GenContext,
+                        ctx: &mut aide::generate::GenContext,
                         operation: &mut aide::openapi::Operation
                     ) -> Option<aide::openapi::Response> {
                         <#output as aide::OperationOutput>::operation_response(
@@ -151,7 +151,7 @@ pub fn derive_operation_io(ts: TokenStream) -> TokenStream {
                         )
                     }
                     fn inferred_responses(
-                        ctx: &mut aide::gen::GenContext,
+                        ctx: &mut aide::generate::GenContext,
                         operation: &mut aide::openapi::Operation
                     ) -> Vec<(Option<u16>, aide::openapi::Response)> {
                         <#output as aide::OperationOutput>::inferred_responses(

crates/aide/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## Unreleased
+
+- **breaking:** Rename `gen` module to `generate`,
+  because `gen` is going to be a keyword in Rust 2024 ([#174])
+
+[#174]: https://github.com/tamasfe/aide/pull/174
+
 ## 0.13.5
 
 - **added:** Implement `OperationHandler` for `axum::handler::Layered` ([#133])

crates/aide/src/axum/inputs.rs

@@ -41,7 +41,7 @@ impl<T> OperationInput for axum_extra::typed_header::TypedHeader<T>
 where
     T: axum_extra::headers::Header,
 {
-    fn operation_input(ctx: &mut crate::gen::GenContext, operation: &mut Operation) {
+    fn operation_input(ctx: &mut crate::generate::GenContext, operation: &mut Operation) {
         let s = ctx.schema.subschema_for::<String>();
         add_parameters(
             ctx,
@@ -72,7 +72,7 @@ where
 
 #[cfg(any(feature = "axum-json", feature = "axum-extra-json-deserializer"))]
 fn operation_input_json<T: JsonSchema>(
-    ctx: &mut crate::gen::GenContext,
+    ctx: &mut crate::generate::GenContext,
     operation: &mut Operation,
 ) {
     let schema = ctx.schema.subschema_for::<T>().into_object();
@@ -108,7 +108,7 @@ impl<T> OperationInput for axum::Json<T>
 where
     T: JsonSchema,
 {
-    fn operation_input(ctx: &mut crate::gen::GenContext, operation: &mut Operation) {
+    fn operation_input(ctx: &mut crate::generate::GenContext, operation: &mut Operation) {
         operation_input_json::<T>(ctx, operation);
     }
 }
@@ -118,7 +118,7 @@ impl<T> OperationInput for axum_extra::extract::JsonDeserializer<T>
 where
     T: JsonSchema,
 {
-    fn operation_input(ctx: &mut crate::gen::GenContext, operation: &mut Operation) {
+    fn operation_input(ctx: &mut crate::generate::GenContext, operation: &mut Operation) {
         operation_input_json::<T>(ctx, operation);
     }
 }
@@ -128,7 +128,7 @@ impl<T> OperationInput for axum::extract::Form<T>
 where
     T: JsonSchema,
 {
-    fn operation_input(ctx: &mut crate::gen::GenContext, operation: &mut Operation) {
+    fn operation_input(ctx: &mut crate::generate::GenContext, operation: &mut Operation) {
         let schema = ctx.schema.subschema_for::<T>().into_object();
         let resolved_schema = ctx.resolve_schema(&schema);
 
@@ -162,7 +162,7 @@ impl<T> OperationInput for Path<T>
 where
     T: JsonSchema,
 {
-    fn operation_input(ctx: &mut crate::gen::GenContext, operation: &mut Operation) {
+    fn operation_input(ctx: &mut crate::generate::GenContext, operation: &mut Operation) {
         let schema = ctx.schema.subschema_for::<T>().into_object();
         let params = parameters_from_schema(ctx, schema, ParamLocation::Path);
         add_parameters(ctx, operation, params);
@@ -174,7 +174,7 @@ impl<T> OperationInput for axum::extract::Query<T>
 where
     T: JsonSchema,
 {
-    fn operation_input(ctx: &mut crate::gen::GenContext, operation: &mut Operation) {
+    fn operation_input(ctx: &mut crate::generate::GenContext, operation: &mut Operation) {
         let schema = ctx.schema.subschema_for::<T>().into_object();
         let params = parameters_from_schema(ctx, schema, ParamLocation::Query);
         add_parameters(ctx, operation, params);
@@ -184,7 +184,7 @@ where
 #[cfg(feature = "axum-ws")]
 impl OperationInput for axum::extract::ws::WebSocketUpgrade {
     fn operation_input(
-        ctx: &mut crate::gen::GenContext,
+        ctx: &mut crate::generate::GenContext,
         operation: &mut crate::openapi::Operation,
     ) {
         if operation.responses.is_none() {
@@ -311,7 +311,7 @@ impl OperationInput for axum::extract::ws::WebSocketUpgrade {
 
 #[cfg(feature = "axum-multipart")]
 impl OperationInput for axum::extract::Multipart {
-    fn operation_input(ctx: &mut crate::gen::GenContext, operation: &mut Operation) {
+    fn operation_input(ctx: &mut crate::generate::GenContext, operation: &mut Operation) {
         set_body(
             ctx,
             operation,
@@ -353,7 +353,7 @@ mod extra {
         T: OperationInput,
     {
         fn operation_input(
-            ctx: &mut crate::gen::GenContext,
+            ctx: &mut crate::generate::GenContext,
             operation: &mut crate::openapi::Operation,
         ) {
             T::operation_input(ctx, operation);
@@ -365,7 +365,7 @@ mod extra {
         T: OperationInput,
     {
         fn operation_input(
-            ctx: &mut crate::gen::GenContext,
+            ctx: &mut crate::generate::GenContext,
             operation: &mut crate::openapi::Operation,
         ) {
             T::operation_input(ctx, operation);
@@ -383,7 +383,7 @@ mod extra {
     where
         T: JsonSchema,
     {
-        fn operation_input(ctx: &mut crate::gen::GenContext, operation: &mut Operation) {
+        fn operation_input(ctx: &mut crate::generate::GenContext, operation: &mut Operation) {
             let schema = ctx.schema.subschema_for::<T>().into_object();
             let resolved_schema = ctx.resolve_schema(&schema);
 
@@ -417,7 +417,7 @@ mod extra {
     where
         T: JsonSchema,
     {
-        fn operation_input(ctx: &mut crate::gen::GenContext, operation: &mut Operation) {
+        fn operation_input(ctx: &mut crate::generate::GenContext, operation: &mut Operation) {
             let schema = ctx.schema.subschema_for::<T>().into_object();
             let params = parameters_from_schema(ctx, schema, ParamLocation::Query);
             add_parameters(ctx, operation, params);

crates/aide/src/axum/mod.rs

@@ -171,7 +171,7 @@
 use std::{convert::Infallible, future::Future, mem, pin::Pin};
 
 use crate::{
-    gen::{self, in_context},
+    generate::{self, in_context},
     openapi::{OpenApi, PathItem, ReferenceOr, SchemaObject},
     operation::OperationHandler,
     util::{merge_paths, path_for_nested_route},
@@ -466,7 +466,7 @@ where
             });
 
         if needs_reset {
-            gen::reset_context();
+            generate::reset_context();
         }
     }
 }

crates/aide/src/axum/outputs.rs

@@ -11,7 +11,7 @@ use schemars::schema::{InstanceType, SingleOrVec};
 #[cfg(any(feature = "axum-form", feature = "axum-json"))]
 use schemars::JsonSchema;
 
-use crate::{gen::GenContext, operation::OperationOutput};
+use crate::{generate::GenContext, operation::OperationOutput};
 
 #[cfg(feature = "axum-json")]
 impl<T> OperationOutput for axum::Json<T>
@@ -41,7 +41,7 @@ where
     }
 
     fn inferred_responses(
-        ctx: &mut crate::gen::GenContext,
+        ctx: &mut crate::generate::GenContext,
         operation: &mut Operation,
     ) -> Vec<(Option<u16>, Response)> {
         if let Some(res) = Self::operation_response(ctx, operation) {
@@ -90,7 +90,7 @@ where
     }
 
     fn inferred_responses(
-        ctx: &mut crate::gen::GenContext,
+        ctx: &mut crate::generate::GenContext,
         operation: &mut Operation,
     ) -> Vec<(Option<u16>, Response)> {
         if let Some(res) = Self::operation_response(ctx, operation) {
@@ -139,7 +139,7 @@ impl<T> OperationOutput for Html<T> {
     }
 
     fn inferred_responses(
-        ctx: &mut crate::gen::GenContext,
+        ctx: &mut crate::generate::GenContext,
         operation: &mut Operation,
     ) -> Vec<(Option<u16>, Response)> {
         if let Some(res) = Self::operation_response(ctx, operation) {
@@ -159,7 +159,7 @@ impl OperationOutput for JsonRejection {
     }
 
     fn inferred_responses(
-        ctx: &mut crate::gen::GenContext,
+        ctx: &mut crate::generate::GenContext,
         operation: &mut Operation,
     ) -> Vec<(Option<u16>, Response)> {
         if let Some(res) = Self::operation_response(ctx, operation) {
@@ -184,7 +184,7 @@ impl OperationOutput for FormRejection {
     }
 
     fn inferred_responses(
-        ctx: &mut crate::gen::GenContext,
+        ctx: &mut crate::generate::GenContext,
         operation: &mut Operation,
     ) -> Vec<(Option<u16>, Response)> {
         if let Some(res) = Self::operation_response(ctx, operation) {

crates/aide/src/axum/routing.rs

@@ -4,7 +4,7 @@
 use std::{convert::Infallible, mem};
 
 use crate::{
-    gen::GenContext,
+    generate::GenContext,
     openapi::{Operation, PathItem, ReferenceOr, Response, StatusCode},
     Error,
 };
@@ -20,7 +20,7 @@ use tower_layer::Layer;
 use tower_service::Service;
 
 use crate::{
-    gen::in_context,
+    generate::in_context,
     operation::{OperationHandler, OperationInput, OperationOutput},
     transform::TransformOperation,
 };

crates/aide/src/helpers/use_api.rs

@@ -5,7 +5,7 @@ use std::{
 
 use serde::{Deserialize, Serialize};
 
-use crate::gen::GenContext;
+use crate::generate::GenContext;
 use crate::openapi::{Operation, Response};
 use crate::{OperationInput, OperationOutput};
 

crates/aide/src/helpers/with_api.rs

@@ -5,7 +5,7 @@ use std::{
 
 use serde::{Deserialize, Serialize};
 
-use crate::gen::GenContext;
+use crate::generate::GenContext;
 use crate::openapi::{Operation, Response};
 use crate::{OperationInput, OperationOutput};
 

crates/aide/src/impls/bytes.rs

@@ -9,7 +9,7 @@ use crate::{
 
 impl OperationInput for Bytes {
     fn operation_input(
-        ctx: &mut crate::gen::GenContext,
+        ctx: &mut crate::generate::GenContext,
         operation: &mut crate::openapi::Operation,
     ) {
         set_body(
@@ -30,7 +30,7 @@ impl OperationInput for Bytes {
 
 impl OperationInput for BytesMut {
     fn operation_input(
-        ctx: &mut crate::gen::GenContext,
+        ctx: &mut crate::generate::GenContext,
         operation: &mut crate::openapi::Operation,
     ) {
         Bytes::operation_input(ctx, operation);
@@ -41,7 +41,7 @@ impl OperationOutput for Bytes {
     type Inner = Self;
 
     fn operation_response(
-        _ctx: &mut crate::gen::GenContext,
+        _ctx: &mut crate::generate::GenContext,
         _operation: &mut Operation,
     ) -> Option<crate::openapi::Response> {
         Some(Response {
@@ -55,7 +55,7 @@ impl OperationOutput for Bytes {
     }
 
     fn inferred_responses(
-        ctx: &mut crate::gen::GenContext,
+        ctx: &mut crate::generate::GenContext,
         operation: &mut Operation,
     ) -> Vec<(Option<u16>, Response)> {
         if let Some(res) = Self::operation_response(ctx, operation) {
@@ -70,14 +70,14 @@ impl OperationOutput for BytesMut {
     type Inner = Self;
 
     fn operation_response(
-        ctx: &mut crate::gen::GenContext,
+        ctx: &mut crate::generate::GenContext,
         operation: &mut Operation,
     ) -> Option<crate::openapi::Response> {
         Bytes::operation_response(ctx, operation)
     }
 
     fn inferred_responses(
-        ctx: &mut crate::gen::GenContext,
+        ctx: &mut crate::generate::GenContext,
         operation: &mut Operation,
     ) -> Vec<(Option<u16>, Response)> {
         Bytes::inferred_responses(ctx, operation)