Skip to content

fix: re-export serde in proc macro #12

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

Merged
fluxdiv merged 1 commit into from
Oct 17, 2025
Merged

fix: re-export serde in proc macro #12

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 Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions quickfig/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ repository.workspace = true
readme = "../README.md"

[dependencies]
serde = { workspace = true }
quickfig_core = { version = "0.2.0", path = "../quickfig_core" }
quickfig_derive = { version = "0.2.0", path = "../quickfig_derive", optional = true }

Expand Down
2 changes: 2 additions & 0 deletions quickfig/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,8 @@
//! );
//! ```

pub use serde;

/// * Core library
/// * Only import `quickfig::core::ConfigFields` if you are manually implementing,
/// if you are deriving use `quickfig::derive::ConfigFields`
Expand Down
22 changes: 8 additions & 14 deletions quickfig_derive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ use quote::{quote, ToTokens};
use syn::{
meta::ParseNestedMeta, parse_macro_input, Attribute, Data, DeriveInput, Ident, Lit, Meta, Type, LitStr, punctuated::Punctuated, Token
};
use anyhow::Result;
use quickfig_core::{
FieldMarker,
Field,
ConfigFields,
};

// https://doc.rust-lang.org/book/ch20-05-macros.html

Expand Down Expand Up @@ -138,21 +132,21 @@ fn impl_config_field_macro(ast: &syn::DeriveInput) -> TokenStream {

let impl_gen = quote! {

impl quickfig::core::ConfigFields for #name {}
impl ::quickfig::core::ConfigFields for #name {}

trait #trait_ident<S>
where
S: serde::de::DeserializeOwned + quickfig::core::config_types::DeserializedConfig,
S: ::quickfig::serde::de::DeserializeOwned + ::quickfig::core::config_types::DeserializedConfig,
{
type CF: quickfig::core::ConfigFields;
type CF: ::quickfig::core::ConfigFields;
fn get<'a>(&'a self, user_enum: Self::CF) ->
std::option::Option<std::vec::Vec<quickfig::core::Field<'a, S>>>;
std::option::Option<std::vec::Vec<::quickfig::core::Field<'a, S>>>;
}

impl #trait_ident<quickfig::core::config_types::JSON> for quickfig::core::Config<quickfig::core::config_types::JSON> {
impl #trait_ident<::quickfig::core::config_types::JSON> for ::quickfig::core::Config<::quickfig::core::config_types::JSON> {
type CF = #name;

fn get<'a>(&'a self, user_enum: Self::CF) -> std::option::Option<std::vec::Vec<quickfig::core::Field<'a, quickfig::core::config_types::JSON>>> {
fn get<'a>(&'a self, user_enum: Self::CF) -> std::option::Option<std::vec::Vec<::quickfig::core::Field<'a, ::quickfig::core::config_types::JSON>>> {

// TODO
// Each arm in this match statement returns Option<Vec<Field>>
Expand All @@ -166,10 +160,10 @@ fn impl_config_field_macro(ast: &syn::DeriveInput) -> TokenStream {
}
}

impl #trait_ident<quickfig::core::config_types::TOML> for quickfig::core::Config<quickfig::core::config_types::TOML> {
impl #trait_ident<::quickfig::core::config_types::TOML> for ::quickfig::core::Config<::quickfig::core::config_types::TOML> {
type CF = #name;

fn get<'a>(&'a self, user_enum: Self::CF) -> std::option::Option<std::vec::Vec<quickfig::core::Field<'a, quickfig::core::config_types::TOML>>> {
fn get<'a>(&'a self, user_enum: Self::CF) -> std::option::Option<std::vec::Vec<::quickfig::core::Field<'a, ::quickfig::core::config_types::TOML>>> {

match user_enum {
#(#match_arms)*,
Expand Down