From e25f93c75a7f096f5f5f02aaf4238293071a7a2e Mon Sep 17 00:00:00 2001 From: Max Audron Date: Wed, 21 Jul 2021 18:31:15 +0200 Subject: rewrite network derive to work more consistently this mainly ensures that the network and override_type / variant options work across the board --- derive/src/network/mod.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'derive/src/network/mod.rs') diff --git a/derive/src/network/mod.rs b/derive/src/network/mod.rs index f39bedd..d62ac98 100644 --- a/derive/src/network/mod.rs +++ b/derive/src/network/mod.rs @@ -18,6 +18,9 @@ pub struct Network { repr: Repr, } +/// List: +/// Map: +/// Maplist: #[derive(Debug, Clone, Copy, FromMeta)] #[darling(default)] pub enum Repr { @@ -182,13 +185,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), - None => { - if let Some(override_type) = &field.override_type { - gen_type(override_type) - } else { - field.ty.clone() - } - } + None => get_field_type(field), } } -- cgit v1.2.3