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

syntax/mod.rs

diff --git a/syntax/mod.rs b/syntax/mod.rs
index 0d07fd0..77e7e64 100644
--- a/syntax/mod.rs
+++ b/syntax/mod.rs
@@ -74,6 +74,7 @@
     pub doc: Doc,
     pub derives: Vec<Derive>,
     pub attrs: OtherAttrs,
+    pub visibility: Token![pub],
     pub type_token: Token![type],
     pub name: Pair,
     pub generics: Lifetimes,

syntax/parse.rs

diff --git a/syntax/parse.rs b/syntax/parse.rs
index b8bf515..0fbdda2 100644
--- a/syntax/parse.rs
+++ b/syntax/parse.rs
@@ -426,6 +426,12 @@
         },
     );
 
+    let visibility = Token![pub](match foreign_type.vis {
+        Visibility::Public(vis) => vis.pub_token.span,
+        Visibility::Crate(vis) => vis.crate_token.span,
+        Visibility::Restricted(vis) => vis.pub_token.span,
+        Visibility::Inherited => foreign_type.ident.span(),
+    });
     let type_token = foreign_type.type_token;
     let name = pair(namespace, &foreign_type.ident, cxx_name, rust_name);
     let generics = Lifetimes {
@@ -445,6 +451,7 @@
         doc,
         derives,
         attrs,
+        visibility,
         type_token,
         name,
         generics,
@@ -630,7 +637,7 @@
 ) -> Result<Api> {
     |input: ParseStream| -> Result<Api> {
         let attrs = input.call(Attribute::parse_outer)?;
-        input.parse::<Visibility>()?;
+        let visibility: Visibility = input.parse()?;
         let type_token: Token![type] = match input.parse()? {
             Some(type_token) => type_token,
             None => {
@@ -686,7 +693,8 @@
         } else if lookahead.peek(Token![:]) || lookahead.peek(Token![;]) {
             // type Opaque: Bound2 + Bound2;
             parse_extern_type_bounded(
-                cx, attrs, type_token, ident, lifetimes, input, lang, trusted, namespace,
+                cx, attrs, visibility, type_token, ident, lifetimes, input, lang, trusted,
+                namespace,
             )
         } else {
             Err(lookahead.error())
@@ -751,6 +759,7 @@
 fn parse_extern_type_bounded(
     cx: &mut Errors,
     attrs: Vec<Attribute>,
+    visibility: Visibility,
     type_token: Token![type],
     ident: Ident,
     generics: Lifetimes,
@@ -810,6 +819,12 @@
         },
     );
 
+    let visibility = Token![pub](match visibility {
+        Visibility::Public(vis) => vis.pub_token.span,
+        Visibility::Crate(vis) => vis.crate_token.span,
+        Visibility::Restricted(vis) => vis.pub_token.span,
+        Visibility::Inherited => ident.span(),
+    });
     let name = pair(namespace, &ident, cxx_name, rust_name);
 
     Ok(match lang {
@@ -820,6 +835,7 @@
         doc,
         derives,
         attrs,
+        visibility,
         type_token,
         name,
         generics,