aboutsummaryrefslogtreecommitdiff
path: root/derive
diff options
context:
space:
mode:
Diffstat (limited to 'derive')
-rw-r--r--derive/src/from/mod.rs3
-rw-r--r--derive/src/lib.rs2
-rw-r--r--derive/src/network/list.rs12
-rw-r--r--derive/src/network/map.rs14
-rw-r--r--derive/src/network/maplist.rs20
-rw-r--r--derive/src/network/mod.rs6
-rw-r--r--derive/src/setters/mod.rs4
7 files changed, 29 insertions, 32 deletions
diff --git a/derive/src/from/mod.rs b/derive/src/from/mod.rs
index ee92016..7fd81bf 100644
--- a/derive/src/from/mod.rs
+++ b/derive/src/from/mod.rs
@@ -1,5 +1,4 @@
use quote::quote;
-use syn;
use syn::parse_macro_input;
use darling::{FromDeriveInput, FromVariant};
@@ -40,7 +39,7 @@ pub fn from(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
let derives = fields
.iter()
- .filter(|field| field.fields.fields.len() > 0 && !field.ignore)
+ .filter(|field| !field.fields.fields.is_empty() && !field.ignore)
.map(|field| {
let variant = &field.ident;
let inner_type = &field.fields.fields[0];
diff --git a/derive/src/lib.rs b/derive/src/lib.rs
index 11b3689..1af459f 100644
--- a/derive/src/lib.rs
+++ b/derive/src/lib.rs
@@ -1,5 +1,3 @@
-use syn;
-
mod from;
mod network;
mod setters;
diff --git a/derive/src/network/list.rs b/derive/src/network/list.rs
index 1fc8f7e..e0bbfa8 100644
--- a/derive/src/network/list.rs
+++ b/derive/src/network/list.rs
@@ -3,18 +3,18 @@ use quote::quote;
use super::{get_field_variant_type, NetworkField};
-pub(crate) fn to(fields: &Vec<NetworkField>) -> Vec<TokenStream> {
+pub(crate) fn to(fields: &[NetworkField]) -> Vec<TokenStream> {
fields
.iter()
.map(|field| {
if !field.skip {
let field_rename = match &field.rename {
Some(name) => name.clone(),
- None => format!("{}", field.ident.as_ref().unwrap()).into(),
+ None => format!("{}", field.ident.as_ref().unwrap()),
};
let field_name = field.ident.as_ref().unwrap();
- let field_type = get_field_variant_type(&field);
+ let field_type = get_field_variant_type(field);
let field_inner = match field.network {
crate::network::NetworkRepr::List => {
@@ -37,7 +37,7 @@ pub(crate) fn to(fields: &Vec<NetworkField>) -> Vec<TokenStream> {
.collect()
}
-pub(crate) fn from(fields: &Vec<NetworkField>) -> Vec<TokenStream> {
+pub(crate) fn from(fields: &[NetworkField]) -> Vec<TokenStream> {
fields
.iter()
.map(|field| {
@@ -45,10 +45,10 @@ pub(crate) fn from(fields: &Vec<NetworkField>) -> Vec<TokenStream> {
let field_rename = match &field.rename {
Some(name) => name.clone(),
- None => format!("{}", field.ident.as_ref().unwrap()).into(),
+ None => format!("{}", field.ident.as_ref().unwrap()),
};
- let field_variant_type = get_field_variant_type(&field);
+ let field_variant_type = get_field_variant_type(field);
let extract_inner = if field.default {
quote! {
diff --git a/derive/src/network/map.rs b/derive/src/network/map.rs
index 4efc3bf..ead71c7 100644
--- a/derive/src/network/map.rs
+++ b/derive/src/network/map.rs
@@ -3,18 +3,18 @@ use quote::quote;
use super::{get_field_variant_type, NetworkField};
-pub(crate) fn to(fields: &Vec<NetworkField>) -> Vec<TokenStream> {
+pub(crate) fn to(fields: &[NetworkField]) -> Vec<TokenStream> {
fields
.iter()
.map(|field| {
if !field.skip {
let field_rename = match &field.rename {
Some(name) => name.clone(),
- None => format!("{}", field.ident.as_ref().unwrap()).into(),
+ None => format!("{}", field.ident.as_ref().unwrap()),
};
let field_name = field.ident.as_ref().unwrap();
- let field_variant_type = get_field_variant_type(&field);
+ let field_variant_type = get_field_variant_type(field);
let field_inner = match field.network {
crate::network::NetworkRepr::List => quote! {
@@ -39,7 +39,7 @@ pub(crate) fn to(fields: &Vec<NetworkField>) -> Vec<TokenStream> {
.collect()
}
-pub(crate) fn from(fields: &Vec<NetworkField>) -> Vec<TokenStream> {
+pub(crate) fn from(fields: &[NetworkField]) -> Vec<TokenStream> {
fields
.iter()
.map(|field| {
@@ -53,7 +53,7 @@ pub(crate) fn from(fields: &Vec<NetworkField>) -> Vec<TokenStream> {
let field_rename = match &field.rename {
Some(name) => name.clone(),
- None => format!("{}", field.ident.as_ref().unwrap()).into(),
+ None => format!("{}", field.ident.as_ref().unwrap()),
};
match field.network {
@@ -73,7 +73,7 @@ pub(crate) fn from(fields: &Vec<NetworkField>) -> Vec<TokenStream> {
.collect()
}
-pub(crate) fn to_vec(_type_name: &Ident, _fields: &Vec<NetworkField>) -> TokenStream {
+pub(crate) fn to_vec(_type_name: &Ident, _fields: &[NetworkField]) -> TokenStream {
quote! {
self.iter().map(|item| {
item.to_network_map().into()
@@ -81,7 +81,7 @@ pub(crate) fn to_vec(_type_name: &Ident, _fields: &Vec<NetworkField>) -> TokenSt
}
}
-pub(crate) fn from_vec(type_name: &Ident, _fields: &Vec<NetworkField>) -> TokenStream {
+pub(crate) fn from_vec(type_name: &Ident, _fields: &[NetworkField]) -> TokenStream {
quote! {
input.iter().map(
|item| #type_name::from_network_map(
diff --git a/derive/src/network/maplist.rs b/derive/src/network/maplist.rs
index b5b4a86..21ea524 100644
--- a/derive/src/network/maplist.rs
+++ b/derive/src/network/maplist.rs
@@ -5,14 +5,14 @@ use crate::network::{gen_type, get_field_type};
use super::NetworkField;
-pub(crate) fn to(fields: &Vec<NetworkField>) -> Vec<TokenStream> {
+pub(crate) fn to(fields: &[NetworkField]) -> Vec<TokenStream> {
fields
.iter()
.map(|field| {
if !field.skip {
let field_rename = match &field.rename {
Some(name) => name.clone(),
- None => format!("{}", field.ident.as_ref().unwrap()).into(),
+ None => format!("{}", field.ident.as_ref().unwrap()),
};
let field_name = field.ident.as_ref().unwrap();
@@ -49,7 +49,7 @@ pub(crate) fn to(fields: &Vec<NetworkField>) -> Vec<TokenStream> {
.collect()
}
-pub(crate) fn to_vec(_type_name: &Ident, fields: &Vec<NetworkField>) -> TokenStream {
+pub(crate) fn to_vec(_type_name: &Ident, fields: &[NetworkField]) -> TokenStream {
let (lists, for_each_inner, map_inserts): (
Vec<TokenStream>,
Vec<TokenStream>,
@@ -60,7 +60,7 @@ pub(crate) fn to_vec(_type_name: &Ident, fields: &Vec<NetworkField>) -> TokenStr
if !field.skip {
let field_rename = match &field.rename {
Some(name) => name.clone(),
- None => format!("{}", field.ident.as_ref().unwrap()).into(),
+ None => format!("{}", field.ident.as_ref().unwrap()),
};
let field_name = field.ident.as_ref().unwrap();
@@ -68,7 +68,7 @@ pub(crate) fn to_vec(_type_name: &Ident, fields: &Vec<NetworkField>) -> TokenStr
let field_type = match field.network {
crate::network::NetworkRepr::List => gen_type("VariantList"),
crate::network::NetworkRepr::Map => gen_type("VariantMap"),
- crate::network::NetworkRepr::None => get_field_type(&field),
+ crate::network::NetworkRepr::None => get_field_type(field),
};
let field_inner = match field.network {
@@ -112,7 +112,7 @@ pub(crate) fn to_vec(_type_name: &Ident, fields: &Vec<NetworkField>) -> TokenStr
}
}
- return (lists, for_each_inner, map_inserts);
+ (lists, for_each_inner, map_inserts)
},
);
@@ -131,7 +131,7 @@ pub(crate) fn to_vec(_type_name: &Ident, fields: &Vec<NetworkField>) -> TokenStr
}
}
-pub(crate) fn from(fields: &Vec<NetworkField>) -> Vec<TokenStream> {
+pub(crate) fn from(fields: &[NetworkField]) -> Vec<TokenStream> {
fields
.iter()
.map(|field| {
@@ -145,7 +145,7 @@ pub(crate) fn from(fields: &Vec<NetworkField>) -> Vec<TokenStream> {
let field_rename = match &field.rename {
Some(name) => name.clone(),
- None => format!("{}", field.ident.as_ref().unwrap()).into(),
+ None => format!("{}", field.ident.as_ref().unwrap()),
};
let field_inner = match field.network {
@@ -179,12 +179,12 @@ pub(crate) fn from(fields: &Vec<NetworkField>) -> Vec<TokenStream> {
.collect()
}
-pub(crate) fn from_vec(type_name: &Ident, fields: &Vec<NetworkField>) -> TokenStream {
+pub(crate) fn from_vec(type_name: &Ident, fields: &[NetworkField]) -> TokenStream {
let field = &fields[0];
let field_rename = match &field.rename {
Some(name) => name.clone(),
- None => format!("{}", field.ident.as_ref().unwrap()).into(),
+ None => format!("{}", field.ident.as_ref().unwrap()),
};
let field_variant = if field.stringlist {
diff --git a/derive/src/network/mod.rs b/derive/src/network/mod.rs
index 8214556..f2ead96 100644
--- a/derive/src/network/mod.rs
+++ b/derive/src/network/mod.rs
@@ -102,12 +102,12 @@ pub fn network_map(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
let to_network_map = match network.repr {
Repr::Maplist => maplist::to(&fields),
- Repr::Map | _ => map::to(&fields),
+ _ => map::to(&fields),
};
let from_network_map = match network.repr {
Repr::Maplist => maplist::from(&fields),
- Repr::Map | _ => map::from(&fields),
+ _ => map::from(&fields),
};
let mut gen = quote! {
@@ -220,7 +220,7 @@ fn get_field_type(field: &NetworkField) -> syn::Type {
fn get_field_variant_type(field: &NetworkField) -> syn::Type {
match &field.variant {
- Some(ty) => gen_type(&ty),
+ Some(ty) => gen_type(ty),
None => get_field_type(field),
}
}
diff --git a/derive/src/setters/mod.rs b/derive/src/setters/mod.rs
index b3d2dd1..79fb011 100644
--- a/derive/src/setters/mod.rs
+++ b/derive/src/setters/mod.rs
@@ -70,7 +70,7 @@ pub fn setters(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
let mut res = String::new();
for c in raw_name.chars().rev() {
- if c <= 'Z' && c >= 'A' {
+ if c.is_ascii_uppercase() {
res.push(c.to_ascii_lowercase());
break;
} else {
@@ -119,5 +119,5 @@ pub fn setters(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
}
};
- return gen.into();
+ gen.into()
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-03 19:23:32 +0000