Skip to content

codegen: fix uses of reserved keyword gen #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Youx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

codegen: fix uses of reserved keyword gen #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions rocket-okapi-codegen/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,18 +122,18 @@ pub fn open_api_from_request_derive(input: TokenStream) -> TokenStream {
let ast: syn::DeriveInput = syn::parse(input).unwrap();
let name = &ast.ident;

let gen = quote! {
let generator = quote! {
impl<'r> rocket_okapi::request::OpenApiFromRequest<'r> for #name {
fn from_request_input(
_gen: &mut rocket_okapi::gen::OpenApiGenerator,
_gen: &mut rocket_okapi::r#gen::OpenApiGenerator,
_name: String,
_required: bool,
) -> rocket_okapi::Result<rocket_okapi::request::RequestHeaderInput> {
Ok(rocket_okapi::request::RequestHeaderInput::None)
}
}
};
gen.into()
generator.into()
}

fn get_add_operation_fn_name(route_fn_name: &Ident) -> Ident {
Expand Down
24 changes: 12 additions & 12 deletions rocket-okapi-codegen/src/openapi_attr/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::r#gen::OpenApiGenerator,
_op_id: String,
) -> ::rocket_okapi::Result<()> {
Ok(())
Expand Down Expand Up @@ -173,7 +173,7 @@ fn create_route_operation_fn(
};
params_names_used.push(arg.to_owned());
params.push(quote! {
<#ty as ::rocket_okapi::request::OpenApiFromParam>::path_parameter(gen, #arg.to_owned())?.into()
<#ty as ::rocket_okapi::request::OpenApiFromParam>::path_parameter(generator, #arg.to_owned())?.into()
})
}
// Multi Path parameters: `/<path..>`
Expand All @@ -191,7 +191,7 @@ fn create_route_operation_fn(
};
params_names_used.push(arg.to_owned());
params.push(quote! {
<#ty as ::rocket_okapi::request::OpenApiFromSegments>::path_multi_parameter(gen, #arg.to_owned())?.into()
<#ty as ::rocket_okapi::request::OpenApiFromSegments>::path_multi_parameter(generator, #arg.to_owned())?.into()
})
}
}
Expand All @@ -211,7 +211,7 @@ fn create_route_operation_fn(
};
params_names_used.push(arg.to_owned());
params_nested_list.push(quote! {
<#ty as ::rocket_okapi::request::OpenApiFromForm>::form_multi_parameter(gen, #arg.to_owned(), true)?.into()
<#ty as ::rocket_okapi::request::OpenApiFromForm>::form_multi_parameter(generator, #arg.to_owned(), true)?.into()
})
}
// Multi Query parameters: `/?<param..>`
Expand All @@ -229,7 +229,7 @@ fn create_route_operation_fn(
};
params_names_used.push(arg.to_owned());
params_nested_list.push(quote! {
<#ty as ::rocket_okapi::request::OpenApiFromForm>::form_multi_parameter(gen, #arg.to_owned(), true)?.into()
<#ty as ::rocket_okapi::request::OpenApiFromForm>::form_multi_parameter(generator, #arg.to_owned(), true)?.into()
})
}

Expand All @@ -246,7 +246,7 @@ fn create_route_operation_fn(
// Add parameter to list
params_names_used.push(data_param.clone());
quote! {
Some(<#ty as ::rocket_okapi::request::OpenApiFromData>::request_body(gen)?.into())
Some(<#ty as ::rocket_okapi::request::OpenApiFromData>::request_body(generator)?.into())
}
}
None => quote! { None },
Expand All @@ -264,10 +264,10 @@ fn create_route_operation_fn(
if !params_names_used.contains(arg) {
params_names_used.push(arg.to_owned());
params_request_guards.push(quote! {
<#ty as ::rocket_okapi::request::OpenApiFromRequest>::from_request_input(gen, #arg.to_owned(), true)?.into()
<#ty as ::rocket_okapi::request::OpenApiFromRequest>::from_request_input(generator, #arg.to_owned(), true)?.into()
});
request_guard_responses.push(quote! {
<#ty as ::rocket_okapi::request::OpenApiFromRequest>::get_responses(gen)?.into()
<#ty as ::rocket_okapi::request::OpenApiFromRequest>::get_responses(generator)?.into()
});
}
}
Expand Down Expand Up @@ -323,10 +323,10 @@ fn create_route_operation_fn(
TokenStream::from(quote! {
#[doc(hidden)]
pub fn #fn_name(
gen: &mut ::rocket_okapi::gen::OpenApiGenerator,
generator: &mut ::rocket_okapi::r#gen::OpenApiGenerator,
operation_id: String,
) -> ::rocket_okapi::Result<()> {
let mut responses = <#return_type as ::rocket_okapi::response::OpenApiResponder>::responses(gen)?;
let mut responses = <#return_type as ::rocket_okapi::response::OpenApiResponder>::responses(generator)?;
// Add responses from Request Guards.
let request_guard_responses = vec![#(#request_guard_responses),*];
for request_guard_response in request_guard_responses {
Expand Down Expand Up @@ -363,7 +363,7 @@ fn create_route_operation_fn(
// Add Security Schemes, different section.
RequestHeaderInput::Security(name, schema, requirement) => {
// Add/replace the security scheme (global).
gen.add_security_scheme(name, schema);
generator.add_security_scheme(name, schema);
// Add the security scheme that are quired for all the route.
security_requirements.push(requirement);
}
Expand Down Expand Up @@ -394,7 +394,7 @@ fn create_route_operation_fn(
Some(server_requirements)
};
// Add route/endpoint to OpenApi object.
gen.add_operation(::rocket_okapi::OperationInfo {
generator.add_operation(::rocket_okapi::OperationInfo {
path: #path.to_owned(),
method: ::rocket::http::Method::#method,
operation: ::rocket_okapi::okapi::openapi3::Operation {
Expand Down
6 changes: 3 additions & 3 deletions rocket-okapi-codegen/src/openapi_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ 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 generator = ::rocket_okapi::r#gen::OpenApiGenerator::new(settings);
#add_operations
let mut spec = gen.into_openapi();
let mut spec = generator.into_openapi();
let mut info = ::rocket_okapi::okapi::openapi3::Info {
title: env!("CARGO_PKG_NAME").to_owned(),
version: env!("CARGO_PKG_VERSION").to_owned(),
Expand Down Expand Up @@ -47,7 +47,7 @@ fn create_add_operations(paths: Punctuated<Path, Comma>) -> TokenStream2 {
let fn_name = fn_name_for_add_operation(path.clone());
let operation_id = operation_id(&path);
quote! {
#fn_name(&mut gen, #operation_id.to_owned())
#fn_name(&mut generator, #operation_id.to_owned())
.expect(&format!("Could not generate OpenAPI operation for `{}`.", stringify!(#path)));
}
});
Expand Down