rename gen module to generator for edition 2025 compatibility

README.md

@@ -88,7 +88,7 @@ You can solve this by implementing it manually, like this:
 
 ```rust
 use rocket_okapi::request::{OpenApiFromRequest, RequestHeaderInput};
-use rocket_okapi::gen::OpenApiGenerator;
+use rocket_okapi::generator::OpenApiGenerator;
 use rocket_sync_db_pools::{diesel, database};
 
 #[database("sqlite_logs")]

examples/custom_schema/src/error.rs

@@ -5,7 +5,7 @@ use rocket::{
 };
 use rocket_okapi::okapi::openapi3::Responses;
 use rocket_okapi::okapi::schemars::{self, Map};
-use rocket_okapi::{gen::OpenApiGenerator, response::OpenApiResponderInner, OpenApiError};
+use rocket_okapi::{generator::OpenApiGenerator, response::OpenApiResponderInner, OpenApiError};
 
 /// Error messages returned to user
 #[derive(Debug, serde::Serialize, schemars::JsonSchema)]

examples/nested/src/error.rs

@@ -5,7 +5,7 @@ use rocket::{
 };
 use rocket_okapi::okapi::openapi3::Responses;
 use rocket_okapi::okapi::schemars::{self, Map};
-use rocket_okapi::{gen::OpenApiGenerator, response::OpenApiResponderInner, OpenApiError};
+use rocket_okapi::{generator::OpenApiGenerator, response::OpenApiResponderInner, OpenApiError};
 
 /// Error messages returned to user
 #[derive(Debug, serde::Serialize, schemars::JsonSchema)]

examples/secure_request_guard/src/api_key.rs

@@ -10,7 +10,7 @@ use rocket_okapi::okapi::openapi3::{
     Object, Responses, SecurityRequirement, SecurityScheme, SecuritySchemeData,
 };
 use rocket_okapi::{
-    gen::OpenApiGenerator,
+    generator::OpenApiGenerator,
     openapi,
     request::{OpenApiFromRequest, RequestHeaderInput},
 };

examples/secure_request_guard/src/cookies.rs

@@ -9,7 +9,7 @@ use rocket::{
 };
 use rocket_okapi::okapi::openapi3::{Object, Parameter, ParameterValue};
 use rocket_okapi::{
-    gen::OpenApiGenerator,
+    generator::OpenApiGenerator,
     openapi,
     request::{OpenApiFromRequest, RequestHeaderInput},
 };

examples/secure_request_guard/src/http_auth.rs

@@ -10,7 +10,7 @@ use rocket_okapi::okapi::openapi3::{
     Object, SecurityRequirement, SecurityScheme, SecuritySchemeData,
 };
 use rocket_okapi::{
-    gen::OpenApiGenerator,
+    generator::OpenApiGenerator,
     openapi,
     request::{OpenApiFromRequest, RequestHeaderInput},
 };

examples/secure_request_guard/src/main.rs

@@ -1,7 +1,7 @@
 use rocket::config::Config;
 use rocket::Request;
 use rocket::{catch, catchers, response, response::Responder, Response};
-use rocket_okapi::gen::OpenApiGenerator;
+use rocket_okapi::generator::OpenApiGenerator;
 use rocket_okapi::okapi;
 use rocket_okapi::okapi::openapi3::{MediaType, Responses};
 use rocket_okapi::okapi::schemars;

examples/secure_request_guard/src/oauth2.rs

@@ -10,7 +10,7 @@ use rocket_okapi::okapi::openapi3::{
     OAuthFlows, Object, SecurityRequirement, SecurityScheme, SecuritySchemeData,
 };
 use rocket_okapi::{
-    gen::OpenApiGenerator,
+    generator::OpenApiGenerator,
     openapi,
     request::{OpenApiFromRequest, RequestHeaderInput},
 };

examples/secure_request_guard/src/open_id.rs

@@ -9,7 +9,7 @@ use rocket_okapi::okapi::openapi3::{
     Object, SecurityRequirement, SecurityScheme, SecuritySchemeData,
 };
 use rocket_okapi::{
-    gen::OpenApiGenerator,
+    generator::OpenApiGenerator,
     openapi,
     request::{OpenApiFromRequest, RequestHeaderInput},
 };

okapi/CHANGELOG.md

@@ -7,6 +7,7 @@ This project follows the [Semantic Versioning standard](https://semver.org/).
 ### Added
 
 ### Changed
+- Changed usages of the `gen` module to `generator` for Edition 2025 compatibility
 
 ### Deprecated
 

rocket-okapi-codegen/src/lib.rs

@@ -101,7 +101,7 @@ pub fn openapi_spec(input: TokenStream) -> TokenStream {
 /// This code is equivalent to:
 /// ```rust,ignore
 /// use rocket_okapi::request::{OpenApiFromRequest, RequestHeaderInput};
-/// use rocket_okapi::gen::OpenApiGenerator;
+/// use rocket_okapi::generator::OpenApiGenerator;
 ///
 /// pub struct MyStructName;
 ///
@@ -125,7 +125,7 @@ pub fn open_api_from_request_derive(input: TokenStream) -> TokenStream {
     let gen = quote! {
         impl<'r> rocket_okapi::request::OpenApiFromRequest<'r> for #name {
             fn from_request_input(
-                _gen: &mut rocket_okapi::gen::OpenApiGenerator,
+                _gen: &mut rocket_okapi::generator::OpenApiGenerator,
                 _name: String,
                 _required: bool,
             ) -> rocket_okapi::Result<rocket_okapi::request::RequestHeaderInput> {

rocket-okapi-codegen/src/openapi_attr/mod.rs

@@ -68,7 +68,7 @@ fn create_empty_route_operation_fn(route_fn: ItemFn) -> TokenStream {
     TokenStream::from(quote! {
         #[doc(hidden)]
         pub fn #fn_name(
-            _gen: &mut ::rocket_okapi::gen::OpenApiGenerator,
+            _gen: &mut ::rocket_okapi::generator::OpenApiGenerator,
             _op_id: String,
         ) -> ::rocket_okapi::Result<()> {
             Ok(())
@@ -323,7 +323,7 @@ fn create_route_operation_fn(
     TokenStream::from(quote! {
         #[doc(hidden)]
         pub fn #fn_name(
-            gen: &mut ::rocket_okapi::gen::OpenApiGenerator,
+            gen: &mut ::rocket_okapi::generator::OpenApiGenerator,
             operation_id: String,
         ) -> ::rocket_okapi::Result<()> {
             let mut responses = <#return_type as ::rocket_okapi::response::OpenApiResponder>::responses(gen)?;

rocket-okapi-codegen/src/openapi_spec.rs

@@ -10,7 +10,7 @@ pub fn create_openapi_spec(routes: TokenStream) -> Result<TokenStream2> {
     let add_operations = create_add_operations(paths);
     Ok(quote! {
         |settings: &::rocket_okapi::settings::OpenApiSettings| -> ::rocket_okapi::okapi::openapi3::OpenApi {
-            let mut gen = ::rocket_okapi::gen::OpenApiGenerator::new(settings);
+            let mut gen = ::rocket_okapi::generator::OpenApiGenerator::new(settings);
             #add_operations
             let mut spec = gen.into_openapi();
             let mut info = ::rocket_okapi::okapi::openapi3::Info {

rocket-okapi/CHANGELOG.md

@@ -7,6 +7,7 @@ This project follows the [Semantic Versioning standard](https://semver.org/).
 ### Added
 
 ### Changed
+- Renamed `gen` module to `generator` for Edition 2025 compatibility
 
 ### Deprecated
 

rocket-okapi/src/lib.rs

@@ -78,7 +78,7 @@ mod error;
 
 /// Contains the `Generator` struct, which you can use to manually control the way a struct is
 /// represented in the documentation.
-pub mod gen;
+pub mod generator;
 /// Contains several `Rocket` `Handler`s, which are used for serving the json files and the swagger
 /// interface.
 pub mod handlers;

rocket-okapi/src/request/from_data_impls.rs

@@ -1,5 +1,5 @@
 use super::OpenApiFromData;
-use crate::gen::OpenApiGenerator;
+use crate::generator::OpenApiGenerator;
 use okapi::{
     openapi3::{MediaType, RequestBody},
     Map,

rocket-okapi/src/request/from_form_multi_param_impls.rs

@@ -1,4 +1,4 @@
-use crate::gen::OpenApiGenerator;
+use crate::generator::OpenApiGenerator;
 use okapi::openapi3::{Object, Parameter, ParameterValue};
 use schemars::schema::{InstanceType, Schema, SchemaObject, SingleOrVec};
 use schemars::JsonSchema;

rocket-okapi/src/request/from_form_param_impls.rs

@@ -2,7 +2,7 @@
 //! <https://docs.rs/rocket/latest/rocket/form/trait.FromForm.html#foreign-impls>
 
 use super::{get_nested_form_parameters, OpenApiFromForm, OpenApiFromFormField};
-use crate::gen::OpenApiGenerator;
+use crate::generator::OpenApiGenerator;
 use okapi::openapi3::{Object, Parameter, ParameterValue};
 use schemars::JsonSchema;
 

rocket-okapi/src/request/from_param_impls.rs

@@ -2,7 +2,7 @@
 //! <https://docs.rs/rocket/latest/rocket/request/trait.FromParam.html#foreign-impls>
 
 use super::OpenApiFromParam;
-use crate::gen::OpenApiGenerator;
+use crate::generator::OpenApiGenerator;
 use okapi::openapi3::{Object, Parameter, ParameterValue};
 use schemars::JsonSchema;
 

rocket-okapi/src/request/from_request_impls.rs

@@ -1,5 +1,5 @@
 use super::{OpenApiFromRequest, RequestHeaderInput};
-use crate::gen::OpenApiGenerator;
+use crate::generator::OpenApiGenerator;
 use okapi::openapi3::*;
 use std::result::Result as StdResult;
 

rocket-okapi/src/request/from_segments_impls.rs

@@ -2,7 +2,7 @@
 //! <https://docs.rs/rocket/latest/rocket/request/trait.FromSegments.html#foreign-impls>
 
 use super::OpenApiFromSegments;
-use crate::gen::OpenApiGenerator;
+use crate::generator::OpenApiGenerator;
 use okapi::openapi3::{Object, Parameter, ParameterValue};
 use schemars::JsonSchema;
 

rocket-okapi/src/request/mod.rs

@@ -5,7 +5,7 @@ mod from_param_impls;
 mod from_request_impls;
 mod from_segments_impls;
 
-use super::gen::OpenApiGenerator;
+use super::generator::OpenApiGenerator;
 use super::Result;
 use okapi::openapi3::{Parameter, RequestBody, Responses, SecurityRequirement, SecurityScheme};
 

rocket-okapi/src/response/mod.rs

@@ -1,6 +1,6 @@
 mod responder_impls;
 
-use super::gen::OpenApiGenerator;
+use super::generator::OpenApiGenerator;
 use super::Result;
 use okapi::openapi3::Responses;
 

rocket-okapi/src/response/responder_impls.rs

@@ -1,6 +1,6 @@
 use super::OpenApiResponderInner;
 use crate::{
-    gen::OpenApiGenerator,
+    generator::OpenApiGenerator,
     util::{
         add_default_response_code, add_schema_response, change_all_responses_to_default,
         ensure_status_code_exists, produce_any_responses, set_content_type, set_status_code,

rocket-okapi/tests/db_pool.rs

@@ -1,6 +1,6 @@
 //! This test should just compile.
 
-use rocket_okapi::gen::OpenApiGenerator;
+use rocket_okapi::generator::OpenApiGenerator;
 use rocket_okapi::request::{OpenApiFromRequest, RequestHeaderInput};
 use rocket_sync_db_pools::{database, diesel};