Skip to content
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

Use re-export of serde_json in macros #541

Merged
merged 1 commit into from
Sep 18, 2024
Merged

Use re-export of serde_json in macros #541

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
1 change: 1 addition & 0 deletions core/src/v2/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ pub use self::{
schema::Schema,
};
pub use paperclip_macros::*;
pub use serde_json;

#[cfg(feature = "codegen")]
use self::resolver::Resolver;
Expand Down
6 changes: 3 additions & 3 deletions macros/src/actix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ pub fn emit_v2_definition(input: TokenStream) -> TokenStream {
let example = if let Some(example) = extract_example(&item_ast.attrs) {
// allow to parse escaped json string or single str value
quote!(
serde_json::from_str::<serde_json::Value>(#example).ok().or_else(|| Some(#example.into()))
paperclip::v2::serde_json::from_str::<paperclip::v2::serde_json::Value>(#example).ok().or_else(|| Some(#example.into()))
)
} else {
quote!(None)
Expand Down Expand Up @@ -1642,7 +1642,7 @@ fn handle_field_struct(
let example = if let Some(example) = extract_example(&field.attrs) {
// allow to parse escaped json string or single str value
quote!({
s.example = serde_json::from_str::<serde_json::Value>(#example).ok().or_else(|| Some(#example.into()));
s.example = paperclip::v2::serde_json::from_str::<paperclip::v2::serde_json::Value>(#example).ok().or_else(|| Some(#example.into()));
})
} else {
quote!({})
Expand Down Expand Up @@ -1727,7 +1727,7 @@ fn handle_enum(e: &DataEnum, serde: &SerdeProps, props_gen: &mut proc_macro2::To
}

props_gen.extend(quote!(
schema.enum_.push(serde_json::json!(#name));
schema.enum_.push(paperclip::v2::serde_json::json!(#name));
));
}
}
Expand Down
6 changes: 3 additions & 3 deletions macros/src/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ pub fn emit_v2_schema_struct(input: TokenStream) -> TokenStream {
}

#[inline]
fn enum_variants(&self) -> Option<&[serde_json::Value]> {
fn enum_variants(&self) -> Option<&[paperclip::v2::serde_json::Value]> {
if self.enum_.is_empty() {
return None
} else {
Expand Down Expand Up @@ -294,7 +294,7 @@ fn schema_fields(name: &Ident, is_ref: bool) -> proc_macro2::TokenStream {
));
gen.extend(quote!(
#[serde(skip_serializing_if = "Option::is_none")]
pub example: Option<serde_json::Value>,
pub example: Option<paperclip::v2::serde_json::Value>,
));

gen.extend(quote!(
Expand All @@ -313,7 +313,7 @@ fn schema_fields(name: &Ident, is_ref: bool) -> proc_macro2::TokenStream {

gen.extend(quote!(
#[serde(default, rename = "enum", skip_serializing_if = "Vec::is_empty")]
pub enum_: Vec<serde_json::Value>,
pub enum_: Vec<paperclip::v2::serde_json::Value>,
));

gen.extend(quote!(
Expand Down
1 change: 1 addition & 0 deletions src/v2/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ pub use paperclip_core::{
v2::{
models::{self, DefaultSchema, ResolvableApi},
schema::{self, Schema},
serde_json,
},
};

Expand Down
Loading