Merge pull request 1339 from dtolnay/viscrate

dtolnay · Jan 30, 2023 · 0911436 · 0911436
2 parents 8903d4d + a70085f
commit 0911436
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 178 deletions.
diff --git a/src/data.rs b/src/data.rs
@@ -169,9 +169,6 @@ ast_enum_of_structs! {
         /// A public visibility level: `pub`.
         Public(VisPublic),
 
-        /// A crate-level visibility: `crate`.
-        Crate(VisCrate),
-
         /// A visibility level restricted to some path: `pub(self)` or
         /// `pub(super)` or `pub(crate)` or `pub(in some::module)`.
         Restricted(VisRestricted),
@@ -189,14 +186,6 @@ ast_struct! {
     }
 }
 
-ast_struct! {
-    /// A crate-level visibility: `crate`.
-    #[cfg_attr(doc_cfg, doc(cfg(any(feature = "full", feature = "derive"))))]
-    pub struct VisCrate {
-        pub crate_token: Token![crate],
-    }
-}
-
 ast_struct! {
     /// A visibility level restricted to some path: `pub(self)` or
     /// `pub(super)` or `pub(crate)` or `pub(in some::module)`.
@@ -313,8 +302,6 @@ pub mod parsing {
 
             if input.peek(Token![pub]) {
                 Self::parse_pub(input)
-            } else if input.peek(Token![crate]) {
-                Self::parse_crate(input)
             } else {
                 Ok(Visibility::Inherited)
             }
@@ -366,16 +353,6 @@ pub mod parsing {
             Ok(Visibility::Public(VisPublic { pub_token }))
         }
 
-        fn parse_crate(input: ParseStream) -> Result<Self> {
-            if input.peek2(Token![::]) {
-                Ok(Visibility::Inherited)
-            } else {
-                Ok(Visibility::Crate(VisCrate {
-                    crate_token: input.parse()?,
-                }))
-            }
-        }
-
         #[cfg(feature = "full")]
         pub(crate) fn is_some(&self) -> bool {
             match self {
@@ -444,13 +421,6 @@ mod printing {
         }
     }
 
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "printing")))]
-    impl ToTokens for VisCrate {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.crate_token.to_tokens(tokens);
-        }
-    }
-
     #[cfg_attr(doc_cfg, doc(cfg(feature = "printing")))]
     impl ToTokens for VisRestricted {
         fn to_tokens(&self, tokens: &mut TokenStream) {

diff --git a/src/gen/clone.rs b/src/gen/clone.rs
diff --git a/src/gen/debug.rs b/src/gen/debug.rs
diff --git a/src/gen/eq.rs b/src/gen/eq.rs
diff --git a/src/gen/fold.rs b/src/gen/fold.rs
diff --git a/src/gen/hash.rs b/src/gen/hash.rs
diff --git a/src/gen/visit.rs b/src/gen/visit.rs
diff --git a/src/gen/visit_mut.rs b/src/gen/visit_mut.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -328,8 +328,7 @@ mod custom_punctuation;
 mod data;
 #[cfg(any(feature = "full", feature = "derive"))]
 pub use crate::data::{
-    Field, Fields, FieldsNamed, FieldsUnnamed, Variant, VisCrate, VisPublic, VisRestricted,
-    Visibility,
+    Field, Fields, FieldsNamed, FieldsUnnamed, Variant, VisPublic, VisRestricted, Visibility,
 };
 
 #[cfg(any(feature = "full", feature = "derive"))]

diff --git a/src/pat.rs b/src/pat.rs
@@ -731,7 +731,7 @@ mod printing {
     use crate::attr::FilterAttrs;
     use proc_macro2::TokenStream;
     use quote::{ToTokens, TokenStreamExt};
- 
+
     #[cfg_attr(doc_cfg, doc(cfg(feature = "printing")))]
     impl ToTokens for PatIdent {
         fn to_tokens(&self, tokens: &mut TokenStream) {

diff --git a/syn.json b/syn.json
diff --git a/tests/debug/gen.rs b/tests/debug/gen.rs
diff --git a/tests/test_derive_input.rs b/tests/test_derive_input.rs
@@ -469,25 +469,6 @@ fn test_pub_restricted() {
     "###);
 }
 
-#[test]
-fn test_vis_crate() {
-    let input = quote! {
-        crate struct S;
-    };
-
-    snapshot!(input as DeriveInput, @r###"
-    DeriveInput {
-        vis: Visibility::Crate,
-        ident: "S",
-        generics: Generics,
-        data: Data::Struct {
-            fields: Unit,
-            semi_token: Some,
-        },
-    }
-    "###);
-}
-
 #[test]
 fn test_pub_restricted_crate() {
     let input = quote! {

diff --git a/tests/test_visibility.rs b/tests/test_visibility.rs
@@ -51,11 +51,6 @@ fn test_pub() {
     assert_vis_parse!("pub", Ok(Visibility::Public(_)));
 }
 
-#[test]
-fn test_crate() {
-    assert_vis_parse!("crate", Ok(Visibility::Crate(_)));
-}
-
 #[test]
 fn test_inherited() {
     assert_vis_parse!("", Ok(Visibility::Inherited));