Fallback to GenericFamily::SansSerif if no font is set

Author: expenses

internal/compiler/passes/embed_glyphs.rs

@@ -137,15 +137,11 @@ pub fn embed_glyphs<'a>(
             let font = {
                 let mut query = collection.query();
 
-                if let Some(ref family) = family {
-                    query.set_families(std::iter::once(fontique::QueryFamily::from(
-                        family.as_str(),
-                    )));
+                query.set_families(std::iter::once(if let Some(ref family) = family {
+                    fontique::QueryFamily::from(family.as_str())
                 } else {
-                    query.set_families(std::iter::once(fontique::QueryFamily::Generic(
-                        fontique::GenericFamily::SansSerif,
-                    )));
-                }
+                    fontique::QueryFamily::Generic(fontique::GenericFamily::SansSerif)
+                }));
 
                 let mut font = None;
 

internal/core/graphics.rs

@@ -164,9 +164,11 @@ impl FontRequest {
         let mut collection = sharedfontique::get_collection();
 
         let mut query = collection.query();
-        query.set_families(
-            self.family.as_ref().map(|family| fontique::QueryFamily::from(family.as_str())),
-        );
+        query.set_families(std::iter::once(if let Some(family) = self.family.as_ref() {
+            fontique::QueryFamily::from(family.as_str())
+        } else {
+            fontique::QueryFamily::Generic(fontique::GenericFamily::SansSerif)
+        }));
 
         query.set_attributes(fontique::Attributes {
             weight: self