Use a more idiomatic module structure

Author: T0mstone

build.rs

@@ -1,12 +1,14 @@
+use self::shared::ModifierSet;
 use std::fmt::Write;
 use std::iter::Peekable;
 use std::path::Path;
 
 type StrResult<T> = Result<T, String>;
 
-include!("src/shared.rs");
+#[path = "src/shared.rs"]
+mod shared;
 
-declare_types!{
+self::shared::declare_types! {
     <'a>
     str = &'a str,
     List = Vec<_>
@@ -97,7 +99,7 @@ fn tokenize(line: &str) -> StrResult<Line> {
             validate_ident(part)?;
         }
         let c = decode_char(tail.ok_or("missing char")?)?;
-        Line::Variant(ModifierSet(rest), c)
+        Line::Variant(ModifierSet::new_unchecked(rest), c)
     } else {
         validate_ident(head)?;
         let c = tail.map(decode_char).transpose()?;

src/lib.rs

@@ -8,10 +8,12 @@
 //! that don't contain the character `.`, but codex only defines
 //! ones that are entirely made of ASCII alphabetical characters.
 
-include!("shared.rs");
+pub use self::shared::ModifierSet;
+
+mod shared;
 
 type StaticSlice<T> = &'static [T];
-declare_types! {
+self::shared::declare_types! {
     derive(Debug, Copy, Clone),
     str = &'static str,
     List = StaticSlice<_>

src/shared.rs

@@ -45,9 +45,13 @@ macro_rules! declare_types {
     };
 }
 
+pub(crate) use declare_types;
+
 /// A set of modifiers.
 #[derive(Debug, Copy, Clone)]
-pub struct ModifierSet<S>(S);
+// note: the visibility needs to be `pub(crate)`,
+// since build.rs outputs `ModifierSet(...)`
+pub struct ModifierSet<S>(pub(crate) S);
 
 impl<S: Default> Default for ModifierSet<S> {
     /// Construct the default modifier set.