Module reorganisation

Author: dhardy

lib/src/anon.rs

@@ -3,8 +3,11 @@
 // You may obtain a copy of the License in the LICENSE-APACHE file or at:
 //     https://www.apache.org/licenses/LICENSE-2.0
 
+//! The `impl_anon!` macro
+
 use crate::fields::{Field, Fields, FieldsNamed, FieldsUnnamed, StructStyle};
-use crate::{IdentFormatter, Scope, ScopeItem};
+use crate::scope::{Scope, ScopeItem};
+use crate::IdentFormatter;
 use proc_macro2::{Span, TokenStream};
 use quote::{quote, ToTokens, TokenStreamExt};
 use syn::token::{Brace, Colon, Comma, Eq, Paren, Semi};

lib/src/autoimpl.rs

@@ -6,7 +6,7 @@
 //! Implementation of the `#[autoimpl]` attribute
 
 use crate::generics::{clause_to_toks, WhereClause};
-use crate::{ForDeref, SimplePath};
+use crate::SimplePath;
 use proc_macro2::{Span, TokenStream as Toks};
 use proc_macro_error::emit_error;
 use quote::{quote, TokenStreamExt};
@@ -17,9 +17,11 @@ use syn::{
     Token,
 };
 
+mod for_deref;
 mod impl_misc;
 mod impl_using;
 
+pub use for_deref::ForDeref;
 pub use impl_misc::*;
 pub use impl_using::*;
 

lib/src/for_deref.rs lib/src/autoimpl/for_deref.rslib/src/for_deref.rs renamed to lib/src/autoimpl/for_deref.rs

@@ -5,7 +5,8 @@
 
 use crate::fields::{Fields, FieldsNamed, FieldsUnnamed};
 use crate::generics::{clause_to_toks, WhereClause};
-use crate::{Scope, ScopeAttr, ScopeItem, SimplePath};
+use crate::scope::{Scope, ScopeAttr, ScopeItem};
+use crate::SimplePath;
 use proc_macro2::{Span, TokenStream};
 use proc_macro_error::emit_error;
 use quote::quote;
@@ -189,7 +190,7 @@ impl Parse for ImplDefault {
 /// Helper fn which can be passed to [`Scope::apply_attrs`]
 ///
 /// This optionally matches [`AttrImplDefault`].
-pub fn find_attr_impl_default(path: &syn::Path) -> Option<&'static dyn ScopeAttr> {
+pub fn find_impl_default(path: &syn::Path) -> Option<&'static dyn ScopeAttr> {
     AttrImplDefault
         .path()
         .matches(path)

lib/src/default.rs

@@ -76,8 +76,8 @@ pub struct Field {
     /// Optional field initializer.
     ///
     /// This is considered legal input when parsing, but not legal output. An
-    /// attribute rule such as [`crate::AttrImplDefault`] must remove the
-    /// initializer before output is generated.
+    /// attribute rule such as [`AttrImplDefault`](crate::scope::AttrImplDefault)
+    /// must remove the initializer before output is generated.
     pub assign: Option<(Token![=], Expr)>,
 }
 

lib/src/fields.rs

@@ -14,19 +14,15 @@
 #![allow(clippy::unnecessary_lazy_evaluations)]
 #![allow(clippy::style)]
 
-mod anon;
+pub mod anon;
 pub mod autoimpl;
 mod default;
 pub mod fields;
-mod for_deref;
 pub mod generics;
-mod scope;
+pub mod scope;
 
-pub use anon::{Anon, AnonField, AnonScope};
-pub use default::{find_attr_impl_default, AttrImplDefault, ImplDefault};
-pub use for_deref::ForDeref;
+pub use default::ImplDefault;
 use proc_macro2::Span;
-pub use scope::{Scope, ScopeAttr, ScopeItem};
 use syn::Ident;
 
 /// Tool to make a formatted [`Ident`](struct@Ident)

lib/src/lib.rs

@@ -3,6 +3,8 @@
 // You may obtain a copy of the License in the LICENSE-APACHE file or at:
 //     https://www.apache.org/licenses/LICENSE-2.0
 
+//! The `impl_scope!` macro
+
 use crate::{fields::Fields, SimplePath};
 use proc_macro2::{Span, TokenStream};
 use proc_macro_error::emit_error;
@@ -15,6 +17,8 @@ use syn::{
     Token, Type, Variant, Visibility,
 };
 
+pub use super::default::{find_impl_default, AttrImplDefault};
+
 /// Attribute rule for [`Scope`]
 ///
 /// Rules are matched via a path, e.g. `&["foo"]` matches `foo` and

lib/src/scope.rs

@@ -39,6 +39,7 @@ doc_comment::doctest!("../README.md");
 
 extern crate proc_macro;
 
+use lib::{anon, scope};
 use proc_macro::TokenStream;
 use proc_macro_error::{emit_call_site_error, proc_macro_error};
 use syn::parse_macro_input;
@@ -372,8 +373,8 @@ pub fn autoimpl(attr: TokenStream, item: TokenStream) -> TokenStream {
 #[proc_macro_error]
 #[proc_macro]
 pub fn impl_scope(input: TokenStream) -> TokenStream {
-    let mut scope = parse_macro_input!(input as lib::Scope);
-    scope.apply_attrs(lib::find_attr_impl_default);
+    let mut scope = parse_macro_input!(input as scope::Scope);
+    scope.apply_attrs(scope::find_impl_default);
     scope.expand().into()
 }
 
@@ -421,7 +422,7 @@ pub fn impl_scope(input: TokenStream) -> TokenStream {
 #[proc_macro_error]
 #[proc_macro]
 pub fn impl_anon(input: TokenStream) -> TokenStream {
-    let mut scope = parse_macro_input!(input as lib::Anon).into_scope();
-    scope.apply_attrs(lib::find_attr_impl_default);
+    let mut scope = parse_macro_input!(input as anon::Anon).into_scope();
+    scope.apply_attrs(scope::find_impl_default);
     scope.expand().into()
 }