Make Variant fields private (#5)

taiki-e · web-flow · commit 38da3076c32f · 2021-05-10T12:49:26.000-07:00
diff --git a/tests/tests/enumerable.rs b/tests/tests/enumerable.rs
@@ -31,16 +31,15 @@ fn test_manual_impl() {
             match self {
                 Enum::Struct { x } => {
                     visitor.visit_variant_named_fields(
-                        &Variant { name: "Struct" },
+                        &Variant::new("Struct"),
                         &NamedValues::new(ENUM_STRUCT_FIELDS, &[Value::String(x)]),
                     );
                 }
                 Enum::Tuple(y) => {
-                    visitor
-                        .visit_variant_unnamed_fields(&Variant { name: "Tuple" }, &[Value::U8(*y)]);
+                    visitor.visit_variant_unnamed_fields(&Variant::new("Tuple"), &[Value::U8(*y)]);
                 }
                 Enum::Unit => {
-                    visitor.visit_variant_unnamed_fields(&Variant { name: "Unit" }, &[]);
+                    visitor.visit_variant_unnamed_fields(&Variant::new("Unit"), &[]);
                 }
             }
         }
diff --git a/valuable-derive/src/expand.rs b/valuable-derive/src/expand.rs
@@ -134,7 +134,7 @@ fn derive_enum(input: &syn::DeriveInput, data: &syn::DataEnum) -> TokenStream {
                 visit_variants.push(quote! {
                     Self::#variant_name { #(#fields),* } => {
                         visitor.visit_variant_named_fields(
-                            &::valuable::Variant { name: #variant_name_literal },
+                            &::valuable::Variant::new(#variant_name_literal),
                             &::valuable::NamedValues::new(
                                 #named_fields_static_name,
                                 &[
@@ -162,7 +162,7 @@ fn derive_enum(input: &syn::DeriveInput, data: &syn::DataEnum) -> TokenStream {
                 visit_variants.push(quote! {
                     Self::#variant_name(#(#bindings),*) => {
                         visitor.visit_variant_unnamed_fields(
-                            &::valuable::Variant { name: #variant_name_literal },
+                            &::valuable::Variant::new(#variant_name_literal),
                             &[
                                 #(::valuable::Valuable::as_value(#bindings),)*
                             ],
@@ -184,7 +184,7 @@ fn derive_enum(input: &syn::DeriveInput, data: &syn::DataEnum) -> TokenStream {
                 visit_variants.push(quote! {
                     Self::#variant_name => {
                         visitor.visit_variant_unnamed_fields(
-                            &::valuable::Variant { name: #variant_name_literal },
+                            &::valuable::Variant::new(#variant_name_literal),
                             &[],
                         );
                     }
diff --git a/valuable/src/enumerable.rs b/valuable/src/enumerable.rs
@@ -29,7 +29,7 @@ pub struct VariantDef<'a> {
 }
 
 pub struct Variant<'a> {
-    pub name: &'a str,
+    name: &'a str,
 }
 
 impl<'a> EnumDef<'a> {

Original file line number	Diff line number	Diff line change
`@@ -31,16 +31,15 @@ fn test_manual_impl() {`
`31`	`31`	`match self {`
`32`	`32`	`Enum::Struct { x } => {`
`33`	`33`	`visitor.visit_variant_named_fields(`
`34`		`- &Variant { name: "Struct" },`
	`34`	`+ &Variant::new("Struct"),`
`35`	`35`	`&NamedValues::new(ENUM_STRUCT_FIELDS, &[Value::String(x)]),`
`36`	`36`	`);`
`37`	`37`	`}`
`38`	`38`	`Enum::Tuple(y) => {`
`39`		`- visitor`
`40`		`- .visit_variant_unnamed_fields(&Variant { name: "Tuple" }, &[Value::U8(*y)]);`
	`39`	`+ visitor.visit_variant_unnamed_fields(&Variant::new("Tuple"), &[Value::U8(*y)]);`
`41`	`40`	`}`
`42`	`41`	`Enum::Unit => {`
`43`		`- visitor.visit_variant_unnamed_fields(&Variant { name: "Unit" }, &[]);`
	`42`	`+ visitor.visit_variant_unnamed_fields(&Variant::new("Unit"), &[]);`
`44`	`43`	`}`
`45`	`44`	`}`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ pub struct VariantDef<'a> {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`pub struct Variant<'a> {`
`32`		`- pub name: &'a str,`
	`32`	`+ name: &'a str,`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`impl<'a> EnumDef<'a> {`