Merge pull request #1384 from iced-rs/update-lyon

Update `lyon` to `1.0`

3 files changed, 10 insertions, 12 deletions

diff --git a/graphics/src/widget/canvas/frame.rs b/graphics/src/widget/canvas/frame.rs
index 8e198b29..2f46079c 100644
--- a/graphics/src/widget/canvas/frame.rs
+++ b/graphics/src/widget/canvas/frame.rs
@@ -110,7 +110,7 @@ impl Frame {
             )
         };
 
-        let _ = result.expect("Tessellate path");
+        result.expect("Tessellate path");
     }
 
     /// Draws an axis-aligned rectangle given its top-left corner coordinate and
@@ -141,10 +141,9 @@ impl Frame {
         let options =
             tessellation::FillOptions::default().with_fill_rule(rule.into());
 
-        let _ = self
-            .fill_tessellator
+        self.fill_tessellator
             .tessellate_rectangle(
-                &lyon::math::Rect::new(top_left, size.into()),
+                &lyon::math::Box2D::new(top_left, top_left + size),
                 &options,
                 &mut buffers,
             )
@@ -189,7 +188,7 @@ impl Frame {
             )
         };
 
-        let _ = result.expect("Stroke path");
+        result.expect("Stroke path");
     }
 
     /// Draws the characters of the given [`Text`] on the [`Frame`], filling
diff --git a/graphics/src/widget/canvas/path.rs b/graphics/src/widget/canvas/path.rs
index f834e286..608507ad 100644
--- a/graphics/src/widget/canvas/path.rs
+++ b/graphics/src/widget/canvas/path.rs
@@ -10,7 +10,7 @@ pub use builder::Builder;
 use crate::canvas::LineDash;
 
 use iced_native::{Point, Size};
-use lyon::algorithms::walk::{walk_along_path, RepeatedPattern};
+use lyon::algorithms::walk::{walk_along_path, RepeatedPattern, WalkerEvent};
 use lyon::path::iterator::PathIterator;
 
 /// An immutable set of points that may or may not be connected.
@@ -81,13 +81,12 @@ pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path {
         walk_along_path(
             path.raw().iter().flattened(0.01),
             0.0,
+            lyon::tessellation::StrokeOptions::DEFAULT_TOLERANCE,
             &mut RepeatedPattern {
-                callback: |position: lyon::algorithms::math::Point,
-                           _tangent,
-                           _distance| {
+                callback: |event: WalkerEvent<'_>| {
                     let point = Point {
-                        x: position.x,
-                        y: position.y,
+                        x: event.position.x,
+                        y: event.position.y,
                     };
 
                     if draw_line {
diff --git a/graphics/src/widget/canvas/path/builder.rs b/graphics/src/widget/canvas/path/builder.rs
index 88acf544..c49ccdc3 100644
--- a/graphics/src/widget/canvas/path/builder.rs
+++ b/graphics/src/widget/canvas/path/builder.rs
@@ -8,7 +8,7 @@ use lyon::path::builder::SvgPathBuilder;
 /// Once a [`Path`] is built, it can no longer be mutated.
 #[allow(missing_debug_implementations)]
 pub struct Builder {
-    raw: lyon::path::builder::WithSvg<lyon::path::path::Builder>,
+    raw: lyon::path::builder::WithSvg<lyon::path::path::BuilderImpl>,
 }
 
 impl Builder {