diff --git a/yaserde_derive/src/de/expand_enum.rs b/yaserde_derive/src/de/expand_enum.rs index 02ffaad..d6107ef 100644 --- a/yaserde_derive/src/de/expand_enum.rs +++ b/yaserde_derive/src/de/expand_enum.rs @@ -27,34 +27,34 @@ pub fn parse( match get_field_type(field) { Some(FieldType::FieldTypeString) => { - build_default_value(&field_label, "e!{String}, "e!{"".to_string()}) + build_default_value(field_label, "e!{String}, "e!{"".to_string()}) } Some(FieldType::FieldTypeBool) => { - build_default_value(&field_label, "e!{bool}, "e!{false}) + build_default_value(field_label, "e!{bool}, "e!{false}) } Some(FieldType::FieldTypeI8) => { - build_default_value(&field_label, "e!{i8}, "e!{0}) + build_default_value(field_label, "e!{i8}, "e!{0}) } Some(FieldType::FieldTypeU8) => { - build_default_value(&field_label, "e!{u8}, "e!{0}) + build_default_value(field_label, "e!{u8}, "e!{0}) } Some(FieldType::FieldTypeI16) => { - build_default_value(&field_label, "e!{i16}, "e!{0}) + build_default_value(field_label, "e!{i16}, "e!{0}) } Some(FieldType::FieldTypeU16) => { - build_default_value(&field_label, "e!{u16}, "e!{0}) + build_default_value(field_label, "e!{u16}, "e!{0}) } Some(FieldType::FieldTypeI32) => { - build_default_value(&field_label, "e!{i32}, "e!{0}) + build_default_value(field_label, "e!{i32}, "e!{0}) } Some(FieldType::FieldTypeU32) => { - build_default_value(&field_label, "e!{u32}, "e!{0}) + build_default_value(field_label, "e!{u32}, "e!{0}) } Some(FieldType::FieldTypeI64) => { - build_default_value(&field_label, "e!{i64}, "e!{0}) + build_default_value(field_label, "e!{i64}, "e!{0}) } Some(FieldType::FieldTypeU64) => { - build_default_value(&field_label, "e!{u64}, "e!{0}) + build_default_value(field_label, "e!{u64}, "e!{0}) } Some(FieldType::FieldTypeStruct { struct_name }) => Some(quote!{ #[allow(unused_mut)] @@ -64,34 +64,34 @@ pub fn parse( let dt = Box::into_raw(data_type); match unsafe { dt.as_ref() } { Some(&FieldType::FieldTypeString) => { - build_default_value(&field_label, "e!{Vec}, "e!{vec![]}) + build_default_value(field_label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeBool) => { - build_default_value(&field_label, "e!{Vec}, "e!{vec![]}) + build_default_value(field_label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeI8) => { - build_default_value(&field_label, "e!{Vec}, "e!{vec![]}) + build_default_value(field_label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeU8) => { - build_default_value(&field_label, "e!{Vec}, "e!{vec![]}) + build_default_value(field_label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeI16) => { - build_default_value(&field_label, "e!{Vec}, "e!{vec![]}) + build_default_value(field_label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeU16) => { - build_default_value(&field_label, "e!{Vec}, "e!{vec![]}) + build_default_value(field_label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeI32) => { - build_default_value(&field_label, "e!{Vec}, "e!{vec![]}) + build_default_value(field_label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeU32) => { - build_default_value(&field_label, "e!{Vec}, "e!{vec![]}) + build_default_value(field_label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeI64) => { - build_default_value(&field_label, "e!{Vec}, "e!{vec![]}) + build_default_value(field_label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeU64) => { - build_default_value(&field_label, "e!{Vec}, "e!{vec![]}) + build_default_value(field_label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeStruct { ref struct_name }) => Some(quote!{ #[allow(unused_mut)] diff --git a/yaserde_derive/src/de/expand_struct.rs b/yaserde_derive/src/de/expand_struct.rs index 0a1bfc0..e1f1303 100644 --- a/yaserde_derive/src/de/expand_struct.rs +++ b/yaserde_derive/src/de/expand_struct.rs @@ -45,19 +45,19 @@ pub fn parse( let label = &field.ident; match get_field_type(field) { Some(FieldType::FieldTypeString) => { - build_default_value(&label, "e!{String}, "e!{"".to_string()}) + build_default_value(label, "e!{String}, "e!{"".to_string()}) } Some(FieldType::FieldTypeBool) => { - build_default_value(&label, "e!{bool}, "e!{false}) + build_default_value(label, "e!{bool}, "e!{false}) } - Some(FieldType::FieldTypeI8) => build_default_value(&label, "e!{i8}, "e!{0}), - Some(FieldType::FieldTypeU8) => build_default_value(&label, "e!{u8}, "e!{0}), - Some(FieldType::FieldTypeI16) => build_default_value(&label, "e!{i16}, "e!{0}), - Some(FieldType::FieldTypeU16) => build_default_value(&label, "e!{u16}, "e!{0}), - Some(FieldType::FieldTypeI32) => build_default_value(&label, "e!{i32}, "e!{0}), - Some(FieldType::FieldTypeU32) => build_default_value(&label, "e!{u32}, "e!{0}), - Some(FieldType::FieldTypeI64) => build_default_value(&label, "e!{i64}, "e!{0}), - Some(FieldType::FieldTypeU64) => build_default_value(&label, "e!{u64}, "e!{0}), + Some(FieldType::FieldTypeI8) => build_default_value(label, "e!{i8}, "e!{0}), + Some(FieldType::FieldTypeU8) => build_default_value(label, "e!{u8}, "e!{0}), + Some(FieldType::FieldTypeI16) => build_default_value(label, "e!{i16}, "e!{0}), + Some(FieldType::FieldTypeU16) => build_default_value(label, "e!{u16}, "e!{0}), + Some(FieldType::FieldTypeI32) => build_default_value(label, "e!{i32}, "e!{0}), + Some(FieldType::FieldTypeU32) => build_default_value(label, "e!{u32}, "e!{0}), + Some(FieldType::FieldTypeI64) => build_default_value(label, "e!{i64}, "e!{0}), + Some(FieldType::FieldTypeU64) => build_default_value(label, "e!{u64}, "e!{0}), Some(FieldType::FieldTypeStruct { struct_name }) => Some(quote!{ #[allow(unused_mut, non_snake_case, non_camel_case_types)] let mut #label : #struct_name = #struct_name::default(); @@ -66,34 +66,34 @@ pub fn parse( let dt = Box::into_raw(data_type); match unsafe { dt.as_ref() } { Some(&FieldType::FieldTypeString) => { - build_default_value(&label, "e!{Vec}, "e!{vec![]}) + build_default_value(label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeBool) => { - build_default_value(&label, "e!{Vec}, "e!{vec![]}) + build_default_value(label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeI8) => { - build_default_value(&label, "e!{Vec}, "e!{vec![]}) + build_default_value(label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeU8) => { - build_default_value(&label, "e!{Vec}, "e!{vec![]}) + build_default_value(label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeI16) => { - build_default_value(&label, "e!{Vec}, "e!{vec![]}) + build_default_value(label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeU16) => { - build_default_value(&label, "e!{Vec}, "e!{vec![]}) + build_default_value(label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeI32) => { - build_default_value(&label, "e!{Vec}, "e!{vec![]}) + build_default_value(label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeU32) => { - build_default_value(&label, "e!{Vec}, "e!{vec![]}) + build_default_value(label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeI64) => { - build_default_value(&label, "e!{Vec}, "e!{vec![]}) + build_default_value(label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeU64) => { - build_default_value(&label, "e!{Vec}, "e!{vec![]}) + build_default_value(label, "e!{Vec}, "e!{vec![]}) } Some(&FieldType::FieldTypeStruct { ref struct_name }) => Some(quote!{ #[allow(unused_mut)] @@ -265,7 +265,7 @@ pub fn parse( &visitor, "e!{= value}, &visitor_label, - &label, + label, &label_name, ) } @@ -276,7 +276,7 @@ pub fn parse( &visitor, "e!{= value}, &visitor_label, - &label, + label, &label_name, ) } @@ -287,7 +287,7 @@ pub fn parse( &visitor, "e!{= value}, &visitor_label, - &label, + label, &label_name, ) } @@ -298,7 +298,7 @@ pub fn parse( &visitor, "e!{= value}, &visitor_label, - &label, + label, &label_name, ) } @@ -309,7 +309,7 @@ pub fn parse( &visitor, "e!{= value}, &visitor_label, - &label, + label, &label_name, ) } @@ -320,7 +320,7 @@ pub fn parse( &visitor, "e!{= value}, &visitor_label, - &label, + label, &label_name, ) } @@ -331,7 +331,7 @@ pub fn parse( &visitor, "e!{= value}, &visitor_label, - &label, + label, &label_name, ) } @@ -342,7 +342,7 @@ pub fn parse( &visitor, "e!{= value}, &visitor_label, - &label, + label, &label_name, ) } @@ -353,7 +353,7 @@ pub fn parse( &visitor, "e!{= value}, &visitor_label, - &label, + label, &label_name, ) } @@ -364,7 +364,7 @@ pub fn parse( &visitor, "e!{= value}, &visitor_label, - &label, + label, &label_name, ) } @@ -392,7 +392,7 @@ pub fn parse( &visitor, "e!{.push(value)}, &visitor_label, - &label, + label, &label_name, ) } @@ -403,7 +403,7 @@ pub fn parse( &visitor, "e!{.push(value)}, &visitor_label, - &label, + label, &label_name, ) } @@ -414,7 +414,7 @@ pub fn parse( &visitor, "e!{.push(value)}, &visitor_label, - &label, + label, &label_name, ) } @@ -425,7 +425,7 @@ pub fn parse( &visitor, "e!{.push(value)}, &visitor_label, - &label, + label, &label_name, ) } @@ -436,7 +436,7 @@ pub fn parse( &visitor, "e!{.push(value)}, &visitor_label, - &label, + label, &label_name, ) } @@ -447,7 +447,7 @@ pub fn parse( &visitor, "e!{.push(value)}, &visitor_label, - &label, + label, &label_name, ) } @@ -458,7 +458,7 @@ pub fn parse( &visitor, "e!{.push(value)}, &visitor_label, - &label, + label, &label_name, ) } @@ -469,7 +469,7 @@ pub fn parse( &visitor, "e!{.push(value)}, &visitor_label, - &label, + label, &label_name, ) } @@ -480,7 +480,7 @@ pub fn parse( &visitor, "e!{.push(value)}, &visitor_label, - &label, + label, &label_name, ) } @@ -491,7 +491,7 @@ pub fn parse( &visitor, "e!{.push(value)}, &visitor_label, - &label, + label, &label_name, ) } @@ -552,31 +552,31 @@ pub fn parse( } }), Some(FieldType::FieldTypeBool) => { - build_call_visitor_for_attribute(&label, &label_name, "e!{visit_bool}, &visitor_label) + build_call_visitor_for_attribute(label, &label_name, "e!{visit_bool}, &visitor_label) } Some(FieldType::FieldTypeI8) => { - build_call_visitor_for_attribute(&label, &label_name, "e!{visit_i8}, &visitor_label) + build_call_visitor_for_attribute(label, &label_name, "e!{visit_i8}, &visitor_label) } Some(FieldType::FieldTypeU8) => { - build_call_visitor_for_attribute(&label, &label_name, "e!{visit_u8}, &visitor_label) + build_call_visitor_for_attribute(label, &label_name, "e!{visit_u8}, &visitor_label) } Some(FieldType::FieldTypeI16) => { - build_call_visitor_for_attribute(&label, &label_name, "e!{visit_i16}, &visitor_label) + build_call_visitor_for_attribute(label, &label_name, "e!{visit_i16}, &visitor_label) } Some(FieldType::FieldTypeU16) => { - build_call_visitor_for_attribute(&label, &label_name, "e!{visit_u16}, &visitor_label) + build_call_visitor_for_attribute(label, &label_name, "e!{visit_u16}, &visitor_label) } Some(FieldType::FieldTypeI32) => { - build_call_visitor_for_attribute(&label, &label_name, "e!{visit_i32}, &visitor_label) + build_call_visitor_for_attribute(label, &label_name, "e!{visit_i32}, &visitor_label) } Some(FieldType::FieldTypeU32) => { - build_call_visitor_for_attribute(&label, &label_name, "e!{visit_u32}, &visitor_label) + build_call_visitor_for_attribute(label, &label_name, "e!{visit_u32}, &visitor_label) } Some(FieldType::FieldTypeI64) => { - build_call_visitor_for_attribute(&label, &label_name, "e!{visit_i64}, &visitor_label) + build_call_visitor_for_attribute(label, &label_name, "e!{visit_i64}, &visitor_label) } Some(FieldType::FieldTypeU64) => { - build_call_visitor_for_attribute(&label, &label_name, "e!{visit_u64}, &visitor_label) + build_call_visitor_for_attribute(label, &label_name, "e!{visit_u64}, &visitor_label) } Some(FieldType::FieldTypeStruct { struct_name }) => { @@ -616,51 +616,51 @@ pub fn parse( match get_field_type(field) { Some(FieldType::FieldTypeString) => { - build_set_text_to_value(&field_attrs, &label, "e!{text_content.to_owned()}) + build_set_text_to_value(&field_attrs, label, "e!{text_content.to_owned()}) } Some(FieldType::FieldTypeBool) => build_set_text_to_value( &field_attrs, - &label, + label, "e!{bool::from_str(text_content).unwrap()}, ), Some(FieldType::FieldTypeI8) => build_set_text_to_value( &field_attrs, - &label, + label, "e!{i8::from_str(text_content).unwrap()}, ), Some(FieldType::FieldTypeU8) => build_set_text_to_value( &field_attrs, - &label, + label, "e!{u8::from_str(text_content).unwrap()}, ), Some(FieldType::FieldTypeI16) => build_set_text_to_value( &field_attrs, - &label, + label, "e!{i16::from_str(text_content).unwrap()}, ), Some(FieldType::FieldTypeU16) => build_set_text_to_value( &field_attrs, - &label, + label, "e!{u16::from_str(text_content).unwrap()}, ), Some(FieldType::FieldTypeI32) => build_set_text_to_value( &field_attrs, - &label, + label, "e!{i32::from_str(text_content).unwrap()}, ), Some(FieldType::FieldTypeU32) => build_set_text_to_value( &field_attrs, - &label, + label, "e!{u32::from_str(text_content).unwrap()}, ), Some(FieldType::FieldTypeI64) => build_set_text_to_value( &field_attrs, - &label, + label, "e!{i64::from_str(text_content).unwrap()}, ), Some(FieldType::FieldTypeU64) => build_set_text_to_value( &field_attrs, - &label, + label, "e!{u64::from_str(text_content).unwrap()}, ),