Merge 446f566 into b2fb04a

linebender · Mar 16, 2022 · cf645da · cf645da
2 parents b2fb04a + 446f566
commit cf645da
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/layer.rs b/src/layer.rs
@@ -46,15 +46,15 @@ impl LayerSet {
     /// reducing memory use.
     pub(crate) fn load(base_dir: &Path, glyph_names: &NameList) -> Result<LayerSet, FontLoadError> {
         let layer_contents_path = base_dir.join(LAYER_CONTENTS_FILE);
-        let to_load: Vec<(Name, PathBuf)> = if layer_contents_path.exists() {
+        let to_load: Vec<(Name, String)> = if layer_contents_path.exists() {
             plist::from_file(&layer_contents_path)
                 .map_err(|source| FontLoadError::ParsePlist { name: LAYER_CONTENTS_FILE, source })?
         } else {
-            vec![(Name::new_raw(DEFAULT_LAYER_NAME), PathBuf::from(DEFAULT_GLYPHS_DIRNAME))]
+            vec![(Name::new_raw(DEFAULT_LAYER_NAME), DEFAULT_GLYPHS_DIRNAME.into())]
         };
 
         let mut layers: Vec<_> = to_load
-            .into_iter()
+            .iter()
             .map(|(name, path)| {
                 let layer_path = base_dir.join(&path);
                 Layer::load_impl(&layer_path, name.clone(), glyph_names).map_err(|source| {
@@ -70,7 +70,12 @@ impl LayerSet {
             .ok_or(FontLoadError::MissingDefaultLayer)?;
         layers.rotate_left(default_idx);
 
-        Ok(LayerSet { layers, path_set: HashSet::new() })
+        Ok(LayerSet {
+            layers,
+            path_set: HashSet::from_iter(
+                to_load.iter().filter(|(_, path)| path != "glyphs").map(|(_, path)| path.into()),
+            ),
+        })
     }
 
     /// Returns the number of layers in the set.