@@ -20,8 +20,8 @@ use internals::ast::{Container, Data, Field, Style};
2020// 8 | enum EnumDef { V }
2121// | ^
2222//
23- pub fn pretend_used ( cont : & Container ) -> TokenStream {
24- let pretend_fields = pretend_fields_used ( cont) ;
23+ pub fn pretend_used ( cont : & Container , is_packed : bool ) -> TokenStream {
24+ let pretend_fields = pretend_fields_used ( cont, is_packed ) ;
2525 let pretend_variants = pretend_variants_used ( cont) ;
2626
2727 quote ! {
@@ -48,7 +48,7 @@ pub fn pretend_used(cont: &Container) -> TokenStream {
4848// The `ref` is important in case the user has written a Drop impl on their
4949// type. Rust does not allow destructuring a struct or enum that has a Drop
5050// impl.
51- fn pretend_fields_used ( cont : & Container ) -> TokenStream {
51+ fn pretend_fields_used ( cont : & Container , is_packed : bool ) -> TokenStream {
5252 let type_ident = & cont. ident ;
5353 let ( _, ty_generics, _) = cont. generics . split_for_impl ( ) ;
5454
@@ -58,14 +58,14 @@ fn pretend_fields_used(cont: &Container) -> TokenStream {
5858 . filter_map ( |variant| match variant. style {
5959 Style :: Struct => {
6060 let variant_ident = & variant. ident ;
61- let pat = struct_pattern ( & variant. fields ) ;
61+ let pat = struct_pattern ( & variant. fields , is_packed ) ;
6262 Some ( quote ! ( #type_ident:: #variant_ident #pat) )
6363 }
6464 _ => None ,
6565 } )
6666 . collect :: < Vec < _ > > ( ) ,
6767 Data :: Struct ( Style :: Struct , fields) => {
68- let pat = struct_pattern ( fields) ;
68+ let pat = struct_pattern ( fields, is_packed ) ;
6969 vec ! [ quote!( #type_ident #pat) ]
7070 }
7171 Data :: Struct ( _, _) => {
@@ -132,9 +132,14 @@ fn pretend_variants_used(cont: &Container) -> TokenStream {
132132 quote ! ( #( #cases) * )
133133}
134134
135- fn struct_pattern ( fields : & [ Field ] ) -> TokenStream {
135+ fn struct_pattern ( fields : & [ Field ] , is_packed : bool ) -> TokenStream {
136136 let members = fields. iter ( ) . map ( |field| & field. member ) ;
137137 let placeholders =
138138 ( 0 ..fields. len ( ) ) . map ( |i| Ident :: new ( & format ! ( "__v{}" , i) , Span :: call_site ( ) ) ) ;
139- quote ! ( { #( #members: ref #placeholders) , * } )
139+ let take_reference = if is_packed {
140+ None
141+ } else {
142+ Some ( quote ! ( ref) )
143+ } ;
144+ quote ! ( { #( #members: #take_reference #placeholders) , * } )
140145}
0 commit comments