Tidy up GenericFamily a bit.

Rename the file in `styled_text` so it matches what it contains.

Just re-export from fontique's root via styled_text rather than
via fontique::generic.

Author: waywardmonkeys

fontique/src/generic.rs

@@ -5,9 +5,7 @@
 
 use super::FamilyId;
 use smallvec::SmallVec;
-
-// FIXME(style): Other users of this can import it from styled_text
-pub use styled_text::GenericFamily;
+use styled_text::GenericFamily;
 
 type FamilyVec = SmallVec<[FamilyId; 2]>;
 

fontique/src/lib.rs

@@ -48,14 +48,13 @@ mod source_cache;
 
 pub use icu_locid::LanguageIdentifier as Language;
 pub use peniko::Blob;
-pub use styled_text::{Stretch, Style, Weight};
+pub use styled_text::{GenericFamily, Stretch, Style, Weight};
 
 pub use attributes::Attributes;
 pub use collection::{Collection, CollectionOptions, Query, QueryFamily, QueryFont, QueryStatus};
 pub use fallback::FallbackKey;
 pub use family::{FamilyId, FamilyInfo};
 pub use font::{AxisInfo, FontInfo, Synthesis};
-pub use generic::GenericFamily;
 pub use script::Script;
 pub use source::{SourceId, SourceInfo, SourceKind};
 

styled_text/src/generic.rs styled_text/src/generic_family.rs

@@ -26,7 +26,7 @@ mod brush;
 mod font_family;
 mod font_settings;
 mod font_stack;
-mod generic;
+mod generic_family;
 pub mod setting;
 mod style_property;
 
@@ -35,5 +35,5 @@ pub use brush::Brush;
 pub use font_family::FontFamily;
 pub use font_settings::{FontFeature, FontSettings, FontVariation};
 pub use font_stack::FontStack;
-pub use generic::GenericFamily;
+pub use generic_family::GenericFamily;
 pub use style_property::StyleProperty;