fix: Fix struct vis. (#47)

* Use visibility of struct for builder.

* Fix format.

Author: ralfbiedert

crates/fundle_macros_impl/src/bundle.rs

@@ -6,7 +6,7 @@ use std::collections::HashMap;
 use proc_macro2::{Ident, TokenStream};
 use quote::quote;
 use syn::parse::Parser;
-use syn::{Attribute, Fields, FieldsNamed, ItemStruct, Path, Type, parse2};
+use syn::{Attribute, Fields, FieldsNamed, ItemStruct, Path, Type, Visibility, parse2};
 
 pub fn bundle(_attr: TokenStream, item: TokenStream) -> syn::Result<TokenStream> {
     let input: ItemStruct = parse2(item)?;
@@ -77,7 +77,7 @@ pub fn bundle(_attr: TokenStream, item: TokenStream) -> syn::Result<TokenStream>
     };
 
     // Generate builder struct
-    let builder_struct = generate_builder_struct(&builder_name, &field_names, &field_types, &type_params);
+    let builder_struct = generate_builder_struct(struct_vis, &builder_name, &field_names, &field_types, &type_params);
 
     // Generate Default impl for builder
     let default_impl = generate_default_impl(&builder_name, &field_names, &type_params);
@@ -160,6 +160,7 @@ pub fn bundle(_attr: TokenStream, item: TokenStream) -> syn::Result<TokenStream>
 
 #[cfg_attr(test, mutants::skip)]
 fn generate_builder_struct(
+    vis: &Visibility,
     builder_name: &Ident,
     field_names: &[&Ident],
     field_types: &[&Type],
@@ -173,7 +174,7 @@ fn generate_builder_struct(
 
     quote! {
         #[allow(non_camel_case_types, dead_code, non_snake_case, clippy::items_after_statements)]
-        struct #builder_name<#(#type_params),*> {
+        #vis struct #builder_name<#(#type_params),*> {
             #(#builder_fields,)*
             _phantom: ::std::marker::PhantomData<(#(#phantom_types),*)>,
         }

crates/fundle_macros_impl/tests/bundle_basic.rs

@@ -15,3 +15,14 @@ fn basic_expansion() {
 
     insta::assert_snapshot!(expand_fundle_bundle!(item));
 }
+
+#[test]
+#[cfg_attr(miri, ignore)]
+fn pub_expansion() {
+    let item: ItemStruct = parse_quote! {
+        #[bundle]
+        pub struct Foo {}
+    };
+
+    insta::assert_snapshot!(expand_fundle_bundle!(item));
+}

crates/fundle_macros_impl/tests/snapshots/bundle_basic__pub_expansion.snap

@@ -0,0 +1,50 @@
+---
+source: crates/fundle_macros_impl/tests/bundle_basic.rs
+assertion_line: 27
+expression: expand_fundle_bundle!(item)
+---
+#[allow(non_camel_case_types, non_snake_case)]
+pub struct Foo {}
+#[allow(non_camel_case_types, non_snake_case, clippy::items_after_statements)]
+impl Foo {
+    pub fn builder() -> FooBuilder {
+        FooBuilder::default()
+    }
+}
+#[allow(non_camel_case_types, dead_code, non_snake_case, clippy::items_after_statements)]
+pub struct FooBuilder {
+    _phantom: ::std::marker::PhantomData<()>,
+}
+#[allow(non_camel_case_types, non_snake_case, clippy::items_after_statements)]
+impl ::std::default::Default for FooBuilder {
+    fn default() -> Self {
+        Self {
+            _phantom: ::std::marker::PhantomData,
+        }
+    }
+}
+impl ::fundle::exports::Exports for Foo {
+    const NUM_EXPORTS: usize = 0usize;
+}
+#[allow(non_camel_case_types, non_snake_case, clippy::items_after_statements)]
+impl FooBuilder {
+    pub fn build(self) -> Foo {
+        Foo {}
+    }
+}
+#[allow(unused_macros, snake_case)]
+macro_rules! Foo {
+    (
+        select($builder_var:ident) => $($forward_type:ident ($forward_field:ident)),*
+        $(,)?
+    ) => {
+        { $(Foo!(verify_field $builder_var $forward_field);)*
+        #[allow(non_camel_case_types, non_snake_case, clippy::items_after_statements)]
+        struct Select < 'a, > { builder : & 'a FooBuilder < >, $($forward_type : & 'a
+        $forward_type,)* } $(#[allow(non_camel_case_types, non_snake_case,
+        clippy::items_after_statements)] impl < 'a, > ::std::convert::AsRef <
+        $forward_type > for Select < 'a, > { fn as_ref(& self) -> & $forward_type { self.
+        $forward_type } })* Select { builder : & $builder_var, $($forward_type :
+        $builder_var . $forward_field .as_ref().unwrap(),)* } }
+    };
+}