Bump lyon, font-kit and skribo versions to fix crashes

c/Cargo.toml

@@ -9,7 +9,7 @@ build = "build.rs"
 crate-type = ["staticlib"]
 
 [dependencies]
-font-kit = "0.2"
+font-kit = "0.4"
 foreign-types = "0.3"
 gl = "0.6"
 libc = "0.2"

canvas/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 crate-type = ["rlib", "staticlib"]
 
 [dependencies]
-font-kit = { version = "0.2", optional = true }
+font-kit = { version = "0.4", optional = true }
 
 [dependencies.pathfinder_content]
 path = "../content"
@@ -25,8 +25,7 @@ optional = true
 
 [dependencies.skribo]
 git = "https://github.com/linebender/skribo.git"
-rev = "a2d683856ba1f2d0095b12dd7823d1602a87614e"
+rev = "03c63ac17bb93e29f82e959dac94027935a21159"
 optional = true
-
 [features]
 pf-text = ["pathfinder_text", "skribo", "font-kit"]

examples/canvas_text/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 edition = "2018"
 
 [dependencies]
-font-kit = "0.2"
+font-kit = "0.4"
 gl = "0.6"
 sdl2 = "0.32"
 sdl2-sys = "0.32"

text/Cargo.toml

@@ -5,9 +5,9 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 edition = "2018"
 
 [dependencies]
-euclid = "0.19"
-font-kit = "0.2"
-lyon_path = "0.12"
+euclid = "0.20"
+font-kit = "0.4"
+lyon_path = "0.14"
 
 [dependencies.pathfinder_content]
 path = "../content"
@@ -20,4 +20,4 @@ path = "../renderer"
 
 [dependencies.skribo]
 git = "https://github.com/linebender/skribo.git"
-rev = "a2d683856ba1f2d0095b12dd7823d1602a87614e"
+rev = "03c63ac17bb93e29f82e959dac94027935a21159"

text/src/lib.rs

@@ -8,11 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use euclid::{Angle, Point2D, Vector2D};
+use euclid::Angle;
+use euclid::default::{Point2D, Vector2D};
 use font_kit::error::GlyphLoadingError;
 use font_kit::hinting::HintingOptions;
 use font_kit::loader::Loader;
-use lyon_path::builder::{FlatPathBuilder, PathBuilder};
+use lyon_path::builder::{FlatPathBuilder, PathBuilder, Build};
 use pathfinder_content::outline::{Contour, Outline};
 use pathfinder_content::stroke::{OutlineStrokeToFill, StrokeStyle};
 use pathfinder_geometry::transform2d::Transform2F;
@@ -172,8 +173,21 @@ impl PathBuilder for OutlinePathBuilder {
     }
 }
 
-impl FlatPathBuilder for OutlinePathBuilder {
+impl Build for OutlinePathBuilder {
     type PathType = Outline;
+    fn build(mut self) -> Outline {
+        self.flush_current_contour();
+        self.outline
+    }
+    
+    fn build_and_reset(&mut self) -> Outline {
+        self.flush_current_contour();
+        mem::replace(&mut self.outline, Outline::new())
+    }
+
+}
+
+impl FlatPathBuilder for OutlinePathBuilder {
 
     fn move_to(&mut self, to: Point2D<f32>) {
         self.flush_current_contour();
@@ -205,13 +219,4 @@ impl FlatPathBuilder for OutlinePathBuilder {
         Point2D::new(point.x(), point.y())
     }
 
-    fn build(mut self) -> Outline {
-        self.flush_current_contour();
-        self.outline
     }
-
-    fn build_and_reset(&mut self) -> Outline {
-        self.flush_current_contour();
-        mem::replace(&mut self.outline, Outline::new())
-    }
-}