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.

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

fix hundreds of clippy warnings #119

Merged
merged 1 commit into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 24 additions & 36 deletions derive/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,118 +30,106 @@ mod parse;
pub fn derive_ser_bin(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
let input = parse::parse_data(input);

if let Some(proxy) = shared::attrs_proxy(&input.attributes()) {
return derive_ser_bin_proxy(&proxy, &input.name());
if let Some(proxy) = shared::attrs_proxy(input.attributes()) {
return derive_ser_bin_proxy(&proxy, input.name());
}

// ok we have an ident, its either a struct or a enum
let ts = match &input {
match &input {
parse::Data::Struct(struct_) if struct_.named => derive_ser_bin_struct(struct_),
parse::Data::Struct(struct_) => derive_ser_bin_struct_unnamed(struct_),
parse::Data::Enum(enum_) => derive_ser_bin_enum(enum_),
_ => unimplemented!("Only structs and enums are supported"),
};

ts
}
}

#[cfg(feature = "binary")]
#[proc_macro_derive(DeBin, attributes(nserde))]
pub fn derive_de_bin(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
let input = parse::parse_data(input);

if let Some(proxy) = shared::attrs_proxy(&input.attributes()) {
return derive_de_bin_proxy(&proxy, &input.name());
if let Some(proxy) = shared::attrs_proxy(input.attributes()) {
return derive_de_bin_proxy(&proxy, input.name());
}

// ok we have an ident, its either a struct or a enum
let ts = match &input {
match &input {
parse::Data::Struct(struct_) if struct_.named => derive_de_bin_struct(struct_),
parse::Data::Struct(struct_) => derive_de_bin_struct_unnamed(struct_),
parse::Data::Enum(enum_) => derive_de_bin_enum(enum_),

_ => unimplemented!("Only structs and enums are supported"),
};

ts
}
}

#[cfg(feature = "ron")]
#[proc_macro_derive(SerRon, attributes(nserde))]
pub fn derive_ser_ron(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
let input = parse::parse_data(input);

if let Some(proxy) = shared::attrs_proxy(&input.attributes()) {
return derive_ser_ron_proxy(&proxy, &input.name());
if let Some(proxy) = shared::attrs_proxy(input.attributes()) {
return derive_ser_ron_proxy(&proxy, input.name());
}

// ok we have an ident, its either a struct or a enum
let ts = match &input {
match &input {
parse::Data::Struct(struct_) if struct_.named => derive_ser_ron_struct(struct_),
parse::Data::Struct(struct_) => derive_ser_ron_struct_unnamed(struct_),
parse::Data::Enum(enum_) => derive_ser_ron_enum(enum_),
_ => unimplemented!("Only structs and enums are supported"),
};

ts
}
}

#[cfg(feature = "ron")]
#[proc_macro_derive(DeRon, attributes(nserde))]
pub fn derive_de_ron(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
let input = parse::parse_data(input);

if let Some(proxy) = shared::attrs_proxy(&input.attributes()) {
return derive_de_ron_proxy(&proxy, &input.name());
if let Some(proxy) = shared::attrs_proxy(input.attributes()) {
return derive_de_ron_proxy(&proxy, input.name());
}

// ok we have an ident, its either a struct or a enum
let ts = match &input {
match &input {
parse::Data::Struct(struct_) if struct_.named => derive_de_ron_struct(struct_),
parse::Data::Struct(struct_) => derive_de_ron_struct_unnamed(struct_),
parse::Data::Enum(enum_) => derive_de_ron_enum(enum_),
_ => unimplemented!("Only structs and enums are supported"),
};

ts
}
}

#[cfg(feature = "json")]
#[proc_macro_derive(SerJson, attributes(nserde))]
pub fn derive_ser_json(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
let input = parse::parse_data(input);

if let Some(proxy) = shared::attrs_proxy(&input.attributes()) {
return derive_ser_json_proxy(&proxy, &input.name());
if let Some(proxy) = shared::attrs_proxy(input.attributes()) {
return derive_ser_json_proxy(&proxy, input.name());
}

// ok we have an ident, its either a struct or a enum
let ts = match &input {
match &input {
parse::Data::Struct(struct_) if struct_.named => derive_ser_json_struct(struct_),
parse::Data::Struct(struct_) => derive_ser_json_struct_unnamed(struct_),
parse::Data::Enum(enum_) => derive_ser_json_enum(enum_),
_ => unimplemented!(""),
};

ts
}
}

#[cfg(feature = "json")]
#[proc_macro_derive(DeJson, attributes(nserde))]
pub fn derive_de_json(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
let input = parse::parse_data(input);

if let Some(proxy) = shared::attrs_proxy(&input.attributes()) {
return derive_de_json_proxy(&proxy, &input.name());
if let Some(proxy) = shared::attrs_proxy(input.attributes()) {
return derive_de_json_proxy(&proxy, input.name());
}

// ok we have an ident, its either a struct or a enum
let ts = match &input {
match &input {
parse::Data::Struct(struct_) if struct_.named => derive_de_json_struct(struct_),
parse::Data::Struct(struct_) => derive_de_json_struct_unnamed(struct_),
parse::Data::Enum(enum_) => derive_de_json_enum(enum_),
parse::Data::Union(_) => unimplemented!("Unions are not supported"),
};

ts
}
}
Loading
Loading