commit 524ff680819b0cc347032210cbf6e24389630a03
author David Tolnay <dtolnay@gmail.com> Wed Dec 30 17:25:38 2020 -0800
committer David Tolnay <dtolnay@gmail.com> Wed Dec 30 17:29:12 2020 -0800
tree eeffceab23253a7f459edcc3bf3f134b9e66de9d
parent e563fd951f5819ea1e9afd2651da37fa80bb996c

Fix span placement on extern C++ type

macro/src/expand.rs

diff --git a/macro/src/expand.rs b/macro/src/expand.rs
index 4fec02d..b6746ac 100644
--- a/macro/src/expand.rs
+++ b/macro/src/expand.rs
@@ -360,15 +360,25 @@
         let field = format_ident!("_lifetime_{}", lifetime.ident);
         quote!(#field: ::std::marker::PhantomData<&#lifetime ()>)
     });
+    let repr_fields = quote! {
+        _private: ::cxx::private::Opaque,
+        #(#lifetime_fields,)*
+    };
+
+    let span = ident.span();
+    let visibility = &ety.visibility;
+    let struct_token = Token![struct](ety.type_token.span);
+    let extern_type_def = quote_spanned! {span=>
+        #visibility #struct_token #ident #generics {
+            #repr_fields
+        }
+    };
 
     quote! {
         #doc
         #attrs
         #[repr(C)]
-        pub struct #ident #generics {
-            _private: ::cxx::private::Opaque,
-            #(#lifetime_fields,)*
-        }
+        #extern_type_def
 
         unsafe impl #generics ::cxx::ExternType for #ident #generics {
             type Id = #type_id;